GitLab steht aufgrund wichtiger Wartungsarbeiten am Montag, den 8. März, zwischen 17:00 und 19:00 Uhr nicht zur Verfügung.

Commit fbe6b8ee authored by Phil Hughes's avatar Phil Hughes

Replaced prefix with to_reference method calls

parent aff5e73f
......@@ -30,6 +30,7 @@ v 8.5.1
- Re-add the newrelic_rpm gem which was removed without any deprecation or warning (Stan Hu)
- Update sentry-raven gem to 0.15.6
- Add build coverage in project's builds page (Steffen Köhler)
- Changed # to ! for merge requests in activity view
v 8.5.0
- Fix duplicate "me" in tooltip of the "thumbsup" awards Emoji (Stan Hu)
......
......@@ -155,12 +155,7 @@ def event_note_target_path(event)
def event_note_title_html(event)
if event.note_target
link_prefix =
if event.note_target.class.name == "Issue"
"#"
else
"!"
end
link_prefix = event.note_target.class.reference_prefix
if event.note_commit?
link_to(
......@@ -175,11 +170,11 @@ def event_note_title_html(event)
link_to(namespace_project_snippet_path(event.project.namespace,
event.project,
event.note_target)) do
"#{event.note_target_type} #{link_prefix}#{truncate event.note_target_id}"
"#{event.note_target_type} #{truncate event.note_target.to_reference}"
end
else
link_to event_note_target_path(event) do
"#{event.note_target_type} #{link_prefix}#{truncate event.note_target_iid}"
"#{event.note_target_type} #{truncate event.note_target.to_reference}"
end
end
else
......
......@@ -4,7 +4,7 @@
= event_action_name(event)
- if event.target
%strong= link_to "!#{event.target_iid}", [event.project.namespace.becomes(Namespace), event.project, event.target]
%strong= link_to "#{event.target.to_reference}", [event.project.namespace.becomes(Namespace), event.project, event.target]
= event_preposition(event)
......
......@@ -48,7 +48,7 @@
= note_count
.merge-request-info
\#{merge_request.iid} ·
\#{merge_request.to_reference} ·
opened #{time_ago_with_tooltip(merge_request.created_at, placement: 'bottom')}
by #{link_to_member(@project, merge_request.author, avatar: false)}
- if merge_request.target_project.default_branch != merge_request.target_branch
......
......@@ -2,7 +2,7 @@
.status-box{ class: status_box_class(@merge_request) }
= @merge_request.state_human_name
%span.identifier
Merge Request !#{@merge_request.iid}
Merge Request #{@merge_request.to_reference}
%span.creator
·
by #{link_to_member(@project, @merge_request.author, size: 24)}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment