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
4b5cb9cd4063
Commit
2629ab44
authored
Apr 14, 2016
by
Phil Hughes
Committed by
Jacob Schatz
Apr 16, 2016
Browse files
Fixed tests
parent
661c0d5661a8
Changes
2
Hide whitespace changes
Inline
Side-by-side
app/helpers/issuables_helper.rb
View file @
4b5cb9cd
...
...
@@ -57,7 +57,7 @@ def milestone_dropdown_label(milestone_title, default_label = "Milestone")
def
issuable_meta
(
issuable
,
project
,
text
)
output
=
content_tag
:strong
,
"
#{
text
}
#{
issuable
.
to_reference
}
"
,
class:
"identifier"
output
<<
" opened
#{
time_ago_with_tooltip
(
issuable
.
created_at
,
skip_js:
true
)
}
by"
.
html_safe
output
<<
" opened
#{
time_ago_with_tooltip
(
issuable
.
created_at
)
}
by"
.
html_safe
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"
)
...
...
app/views/projects/issues/show.html.haml
View file @
4b5cb9cd
...
...
@@ -62,11 +62,11 @@
=
@issue
.
description
=
edited_time_ago_with_tooltip
(
@issue
,
placement:
'bottom'
,
html_class:
'issue_edited_ago'
)
#merge-requests
{
'
data
-url'
=>
referenced_merge_requests_namespace_project_issue_url
(
@project
.
namespace
,
@project
,
@issue
)}
// This element is filled in using JavaScript.
#merge-requests
{
data
:
{
url:
referenced_merge_requests_namespace_project_issue_url
(
@project
.
namespace
,
@project
,
@issue
)
}
}
// This element is filled in using JavaScript.
#related-branches
{
'
data
-url'
=>
related_branches_namespace_project_issue_url
(
@project
.
namespace
,
@project
,
@issue
)}
// This element is filled in using JavaScript.
#related-branches
{
data
:
{
url:
related_branches_namespace_project_issue_url
(
@project
.
namespace
,
@project
,
@issue
)
}
}
// This element is filled in using JavaScript.
.content-block.content-block-small
=
render
'new_branch'
...
...
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