Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
613e0bc5
Commit
613e0bc5
authored
Mar 17, 2016
by
Arinde Eniola
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix inconsistency in the header of issue and merge request pages
parent
d1fd2cb8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
13 deletions
+15
-13
app/views/projects/issues/show.html.haml
app/views/projects/issues/show.html.haml
+5
-6
app/views/projects/merge_requests/show/_mr_title.html.haml
app/views/projects/merge_requests/show/_mr_title.html.haml
+10
-7
No files found.
app/views/projects/issues/show.html.haml
View file @
613e0bc5
...
@@ -25,17 +25,16 @@
...
@@ -25,17 +25,16 @@
%strong
.identifier
%strong
.identifier
Issue ##{@issue.iid}
Issue ##{@issue.iid}
%span
.creator
%span
.creator
by
opened
.editor-details
.editor-details
.editor-details
.editor-details
=
time_ago_with_tooltip
(
@issue
.
created_at
)
by
%strong
%strong
=
link_to_member
(
@project
,
@issue
.
author
,
size:
24
,
mobile_classes:
"hidden-xs"
)
=
link_to_member
(
@project
,
@issue
.
author
,
avatar:
false
,
size:
24
,
mobile_classes:
"hidden-xs"
)
%span
.hidden-xs
=
'@'
+
@issue
.
author
.
username
%strong
%strong
=
link_to_member
(
@project
,
@issue
.
author
,
size:
24
,
mobile_classes:
"hidden-sm hidden-md hidden-lg"
,
=
link_to_member
(
@project
,
@issue
.
author
,
avatar:
false
,
size:
24
,
mobile_classes:
"hidden-sm hidden-md hidden-lg"
,
by_username:
true
,
avatar:
false
)
by_username:
true
,
avatar:
false
)
=
time_ago_with_tooltip
(
@issue
.
created_at
)
.pull-right.issue-btn-group
.pull-right.issue-btn-group
-
if
can?
(
current_user
,
:create_issue
,
@project
)
-
if
can?
(
current_user
,
:create_issue
,
@project
)
...
...
app/views/projects/merge_requests/show/_mr_title.html.haml
View file @
613e0bc5
...
@@ -8,18 +8,21 @@
...
@@ -8,18 +8,21 @@
=
icon
(
'angle-double-left'
)
=
icon
(
'angle-double-left'
)
.issue-meta
.issue-meta
%strong
.identifier
%strong
.identifier
Merge Request ##{@merge_request.iid}
%span
.hidden-sm.hidden-md.hidden-lg
MR
%span
.hidden-xs
Merge Request
!
#{@merge_request.iid}
%span
.creator
%span
.creator
by
opened
.editor-details
.editor-details
=
time_ago_with_tooltip
(
@merge_request
.
created_at
)
by
%strong
%strong
=
link_to_member
(
@project
,
@merge_request
.
author
,
size:
24
,
mobile_classes:
"hidden-xs"
)
=
link_to_member
(
@project
,
@merge_request
.
author
,
avatar:
false
,
size:
24
,
mobile_classes:
"hidden-xs"
)
%span
.hidden-xs
=
'@'
+
@merge_request
.
author
.
username
%strong
%strong
=
link_to_member
(
@project
,
@merge_request
.
author
,
size:
24
,
mobile_classes:
"hidden-sm hidden-md hidden-lg"
,
=
link_to_member
(
@project
,
@merge_request
.
author
,
avatar:
false
,
size:
24
,
mobile_classes:
"hidden-sm hidden-md hidden-lg"
,
by_username:
true
,
avatar:
false
)
by_username:
true
,
avatar:
false
)
=
time_ago_with_tooltip
(
@merge_request
.
created_at
)
.issue-btn-group.pull-right
.issue-btn-group.pull-right
-
if
can?
(
current_user
,
:update_merge_request
,
@merge_request
)
-
if
can?
(
current_user
,
:update_merge_request
,
@merge_request
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment