Merge branch 'mr-prefix-activity-view' into 'master'
Changed # to ! on merge requests on activity view Closes #9082 ![Screen_Shot_2016-02-23_at_11.59.55](/uploads/87b859ae63282ae24025168404beb158/Screen_Shot_2016-02-23_at_11.59.55.png) See merge request !2938
This commit is contained in:
commit
b2f0b3f145
|
@ -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)
|
||||
|
|
|
@ -168,11 +168,11 @@ module EventsHelper
|
|||
link_to(namespace_project_snippet_path(event.project.namespace,
|
||||
event.project,
|
||||
event.note_target)) do
|
||||
"#{event.note_target_type} ##{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} ##{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
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
- page_title "#{@merge_request.title} (##{@merge_request.iid})", "Merge Requests"
|
||||
- page_title "#{@merge_request.title} (#{@merge_request.to_reference})", "Merge Requests"
|
||||
- page_description @merge_request.description
|
||||
- page_card_attributes @merge_request.card_attributes
|
||||
|
||||
|
|
|
@ -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)}
|
||||
|
|
Loading…
Reference in New Issue