From aff5e73f2a1daedbbff148274ad9222d377280b2 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Tue, 23 Feb 2016 11:59:37 +0000 Subject: Changed # to ! on merge requests on activity view Closes #9082 --- app/helpers/events_helper.rb | 11 +++++++++-- app/views/events/event/_common.html.haml | 2 +- app/views/projects/merge_requests/_merge_request.html.haml | 2 +- app/views/projects/merge_requests/show/_mr_title.html.haml | 2 +- 4 files changed, 12 insertions(+), 5 deletions(-) (limited to 'app') diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index 31bf45baeb7..0cb3223c0e1 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -155,6 +155,13 @@ module EventsHelper def event_note_title_html(event) if event.note_target + link_prefix = + if event.note_target.class.name == "Issue" + "#" + else + "!" + end + if event.note_commit? link_to( namespace_project_commit_path(event.project.namespace, event.project, @@ -168,11 +175,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} #{link_prefix}#{truncate event.note_target_id}" end else link_to event_note_target_path(event) do - "#{event.note_target_type} ##{truncate event.note_target_iid}" + "#{event.note_target_type} #{link_prefix}#{truncate event.note_target_iid}" end end else diff --git a/app/views/events/event/_common.html.haml b/app/views/events/event/_common.html.haml index 4ecf1c33d2a..2f531e08a91 100644 --- a/app/views/events/event/_common.html.haml +++ b/app/views/events/event/_common.html.haml @@ -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_iid}", [event.project.namespace.becomes(Namespace), event.project, event.target] = event_preposition(event) diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index b9d5982a56f..e1de023e9be 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -48,7 +48,7 @@ = note_count .merge-request-info - \##{merge_request.iid} · + \#{merge_request.iid} · 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 diff --git a/app/views/projects/merge_requests/show/_mr_title.html.haml b/app/views/projects/merge_requests/show/_mr_title.html.haml index 14ea7b17786..94b49baadf5 100644 --- a/app/views/projects/merge_requests/show/_mr_title.html.haml +++ b/app/views/projects/merge_requests/show/_mr_title.html.haml @@ -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.iid} %span.creator · by #{link_to_member(@project, @merge_request.author, size: 24)} -- cgit v1.2.3 From fbe6b8eeca5443922aea9bac6bf35aedf4103b57 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Tue, 23 Feb 2016 13:38:34 +0000 Subject: Replaced prefix with to_reference method calls --- app/helpers/events_helper.rb | 11 +++-------- app/views/events/event/_common.html.haml | 2 +- app/views/projects/merge_requests/_merge_request.html.haml | 2 +- app/views/projects/merge_requests/show/_mr_title.html.haml | 2 +- 4 files changed, 6 insertions(+), 11 deletions(-) (limited to 'app') diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index 0cb3223c0e1..127cd8f1812 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -155,12 +155,7 @@ module EventsHelper 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 @@ module EventsHelper 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 diff --git a/app/views/events/event/_common.html.haml b/app/views/events/event/_common.html.haml index 2f531e08a91..a606640b0f1 100644 --- a/app/views/events/event/_common.html.haml +++ b/app/views/events/event/_common.html.haml @@ -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) diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index e1de023e9be..abeadc83b53 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -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 diff --git a/app/views/projects/merge_requests/show/_mr_title.html.haml b/app/views/projects/merge_requests/show/_mr_title.html.haml index 94b49baadf5..b634a4af8d2 100644 --- a/app/views/projects/merge_requests/show/_mr_title.html.haml +++ b/app/views/projects/merge_requests/show/_mr_title.html.haml @@ -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)} -- cgit v1.2.3 From 8e8df6d562f2cfc8d351279ec57ece939cab2b1b Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Tue, 23 Feb 2016 14:15:30 +0000 Subject: Removed un-used variables --- app/helpers/events_helper.rb | 2 -- app/views/projects/merge_requests/_merge_request.html.haml | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'app') diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index 127cd8f1812..e5fcaab9551 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -155,8 +155,6 @@ module EventsHelper def event_note_title_html(event) if event.note_target - link_prefix = event.note_target.class.reference_prefix - if event.note_commit? link_to( namespace_project_commit_path(event.project.namespace, event.project, diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index abeadc83b53..18cf3f14f0b 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -48,7 +48,7 @@ = note_count .merge-request-info - \#{merge_request.to_reference} · + #{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 -- cgit v1.2.3 From faac0f261e7f3b1b7b78ac46bbedae636d09850a Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Tue, 1 Mar 2016 13:04:59 +0000 Subject: Fixed issue based on feedback with link text output --- app/views/events/event/_common.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') diff --git a/app/views/events/event/_common.html.haml b/app/views/events/event/_common.html.haml index a606640b0f1..e9e16a7646f 100644 --- a/app/views/events/event/_common.html.haml +++ b/app/views/events/event/_common.html.haml @@ -4,7 +4,7 @@ = event_action_name(event) - if event.target - %strong= link_to "#{event.target.to_reference}", [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) -- cgit v1.2.3 From 43f3439d98ef1e0b361ac174c848c0e923bd82e4 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Tue, 1 Mar 2016 13:15:09 +0000 Subject: Changed page title --- app/views/projects/merge_requests/_show.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index 648512e5379..d7bc26e24b9 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -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 -- cgit v1.2.3