diff options
author | Douwe Maan <douwe@selenight.nl> | 2017-05-20 14:27:35 -0500 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2017-05-25 15:21:30 -0500 |
commit | e45e540d1d90549cc5f45521360241afce9eaf18 (patch) | |
tree | 5a01a839261b97ea3caac9621fe19bb80e15a93b /app/views/events | |
parent | e20eb71203aa29458d7f51a27d42a3d8208e2494 (diff) | |
download | gitlab-ce-e45e540d1d90549cc5f45521360241afce9eaf18.tar.gz |
Consistently display last push event widget
Diffstat (limited to 'app/views/events')
-rw-r--r-- | app/views/events/_event_last_push.html.haml | 14 | ||||
-rw-r--r-- | app/views/events/event/_push.html.haml | 2 |
2 files changed, 1 insertions, 15 deletions
diff --git a/app/views/events/_event_last_push.html.haml b/app/views/events/_event_last_push.html.haml deleted file mode 100644 index 1584695a62b..00000000000 --- a/app/views/events/_event_last_push.html.haml +++ /dev/null @@ -1,14 +0,0 @@ -- if show_last_push_widget?(event) - .row-content-block.clear-block.last-push-widget - .event-last-push - .event-last-push-text - %span You pushed to - = link_to namespace_project_commits_path(event.project.namespace, event.project, event.ref_name), title: h(event.project.name) do - %strong= event.ref_name - %span at - %strong= link_to_project event.project - #{time_ago_with_tooltip(event.created_at)} - - .pull-right - = link_to new_mr_path_from_push_event(event), title: "New merge request", class: "btn btn-info btn-sm" do - Create merge request diff --git a/app/views/events/event/_push.html.haml b/app/views/events/event/_push.html.haml index c0943100ae3..769ac655d0a 100644 --- a/app/views/events/event/_push.html.haml +++ b/app/views/events/event/_push.html.haml @@ -7,7 +7,7 @@ %span.pushed #{event.action_name} #{event.ref_type} %strong - commits_link = namespace_project_commits_path(project.namespace, project, event.ref_name) - = link_to_if project.repository.branch_exists?(event.ref_name), event.ref_name, commits_link + = link_to_if project.repository.branch_exists?(event.ref_name), event.ref_name, commits_link, class: 'ref-name' = render "events/event_scope", event: event |