Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
8179d6f1e506
Commit
6c949b2b
authored
Apr 01, 2016
by
Phil Hughes
Committed by
Jacob Schatz
Apr 16, 2016
Browse files
Moved meta information into an issuable helper method
parent
d3911d655e7a
Changes
3
Hide whitespace changes
Inline
Side-by-side
app/helpers/issuables_helper.rb
View file @
8179d6f1
...
...
@@ -55,6 +55,17 @@ def milestone_dropdown_label(milestone_title, default_label = "Milestone")
h
(
milestone_title
.
presence
||
default_label
)
end
def
issuable_meta
(
issuable
,
project
,
text
)
output
=
content_tag
:strong
,
"
#{
text
}
#{
issuable
.
to_reference
}
"
,
class:
"identifier"
output
<<
" opened "
output
<<
time_ago_with_tooltip
(
issuable
.
created_at
)
output
<<
" by "
output
<<
content_tag
(
:strong
)
do
author_output
=
link_to_member
(
project
,
issuable
.
author
,
size:
24
,
mobile_classes:
"hidden-xs"
)
author_output
<<
link_to_member
(
project
,
issuable
.
author
,
size:
24
,
by_username:
true
,
avatar:
false
,
mobile_classes:
"hidden-sm hidden-md hidden-lg"
)
end
end
private
def
sidebar_gutter_collapsed?
...
...
app/views/projects/issues/show.html.haml
View file @
8179d6f1
...
...
@@ -18,14 +18,7 @@
.issuable-meta
=
confidential_icon
(
@issue
)
%strong
.identifier
Issue
#{
@issue
.
to_reference
}
opened
=
time_ago_with_tooltip
(
@issue
.
created_at
)
by
%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
,
mobile_classes:
"hidden-sm hidden-md hidden-lg"
)
=
issuable_meta
(
@issue
,
@project
,
"Issue"
)
.issuable-actions
.clearfix.issue-btn-group.dropdown
...
...
app/views/projects/merge_requests/show/_mr_title.html.haml
View file @
8179d6f1
...
...
@@ -7,16 +7,9 @@
%a
.btn.btn-default.pull-right.visible-xs-block.gutter-toggle.issuable-gutter-toggle.js-sidebar-toggle
{
href:
"#"
}
=
icon
(
'angle-double-left'
)
.issuable-meta
%strong
.identifier
Merge Request
#{
@merge_request
.
to_reference
}
opened
=
time_ago_with_tooltip
(
@merge_request
.
created_at
)
by
%strong
=
link_to_member
(
@project
,
@merge_request
.
author
,
size:
24
,
mobile_classes:
"hidden-xs"
)
=
link_to_member
(
@project
,
@merge_request
.
author
,
size:
24
,
mobile_classes:
"hidden-sm hidden-md hidden-lg"
,
by_username:
true
,
avatar:
false
)
=
issuable_meta
(
@merge_request
,
@project
,
"Merge Request"
)
-
if
can?
(
current_user
,
:update_merge_request
,
@merge_request
)
.issuable-actions
...
...
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