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
Boxiang Sun
gitlab-ce
Commits
6e6a2518
Commit
6e6a2518
authored
9 years ago
by
Jacob Schatz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Combining recent change to have username in header with my MR.
parent
cabd228f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
6 deletions
+13
-6
app/views/projects/issues/show.html.haml
app/views/projects/issues/show.html.haml
+9
-5
app/views/projects/merge_requests/show/_mr_title.html.haml
app/views/projects/merge_requests/show/_mr_title.html.haml
+4
-1
No files found.
app/views/projects/issues/show.html.haml
View file @
6e6a2518
...
...
@@ -27,11 +27,15 @@
%span
.creator
by
.editor-details
%strong
=
link_to_member
(
@project
,
@issue
.
author
,
size:
24
,
mobile_classes:
"hidden-xs"
)
=
link_to_member
(
@project
,
@issue
.
author
,
size:
24
,
by_username:
true
,
avatar:
false
)
=
time_ago_with_tooltip
(
@issue
.
created_at
,
placement:
'bottom'
,
html_class:
'issue_created_ago'
)
.editor-details
%strong
=
link_to_member
(
@project
,
@issue
.
author
,
size:
24
,
mobile_classes:
"hidden-xs"
)
%span
.hidden-xs
=
'@'
+
@issue
.
author
.
username
%strong
=
link_to_member
(
@project
,
@issue
.
author
,
size:
24
,
mobile_classes:
"hidden-sm hidden-md hidden-lg"
,
by_username:
true
,
avatar:
false
)
=
time_ago_with_tooltip
(
@issue
.
created_at
)
.pull-right.issue-btn-group
-
if
can?
(
current_user
,
:create_issue
,
@project
)
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/merge_requests/show/_mr_title.html.haml
View file @
6e6a2518
...
...
@@ -14,7 +14,10 @@
.editor-details
%strong
=
link_to_member
(
@project
,
@merge_request
.
author
,
size:
24
,
mobile_classes:
"hidden-xs"
)
=
link_to_member
(
@project
,
@merge_request
.
author
,
size:
24
,
%span
.hidden-xs
=
'@'
+
@merge_request
.
author
.
username
%strong
=
link_to_member
(
@project
,
@merge_request
.
author
,
size:
24
,
mobile_classes:
"hidden-sm hidden-md hidden-lg"
,
by_username:
true
,
avatar:
false
)
=
time_ago_with_tooltip
(
@merge_request
.
created_at
)
...
...
This diff is collapsed.
Click to expand it.
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