diff options
author | Lin Jen-Shin (godfat) <godfat@godfat.org> | 2017-05-26 19:18:07 +0000 |
---|---|---|
committer | Lin Jen-Shin (godfat) <godfat@godfat.org> | 2017-05-26 19:18:07 +0000 |
commit | b5e8de5c4c202d10ef8b48248b12f49c1330d04a (patch) | |
tree | e034bee79723e84eab1e9257c3848d4c991d5333 /app/views/projects/_last_push.html.haml | |
parent | 8f44bc4dc10caf3c9856a8e4bea5ac145a315131 (diff) | |
parent | 3605e4307ddf373071c0353a066c50fcead01e45 (diff) | |
download | gitlab-ce-b5e8de5c4c202d10ef8b48248b12f49c1330d04a.tar.gz |
Merge branch 'master' into '24196-protected-variables'
# Conflicts:
# db/schema.rb
Diffstat (limited to 'app/views/projects/_last_push.html.haml')
-rw-r--r-- | app/views/projects/_last_push.html.haml | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/app/views/projects/_last_push.html.haml b/app/views/projects/_last_push.html.haml index f8a6e98d280..e8b1940af2d 100644 --- a/app/views/projects/_last_push.html.haml +++ b/app/views/projects/_last_push.html.haml @@ -1,18 +1,18 @@ -- if event = last_push_event - - if show_last_push_widget?(event) - .row-content-block.top-block.hidden-xs.white - %div{ class: container_class } - .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, class: 'commit-sha') do - %strong= event.ref_name - - if @project && event.project != @project - %span at - %strong= link_to_project event.project - = clipboard_button(text: event.ref_name, class: 'btn-clipboard btn-transparent', title: 'Copy branch to clipboard') - #{time_ago_with_tooltip(event.created_at)} +- event = last_push_event +- if event && show_last_push_widget?(event) + .row-content-block.top-block.hidden-xs.white + .event-last-push + .event-last-push-text + %span You pushed to + %strong + = link_to event.ref_name, namespace_project_commits_path(event.project.namespace, event.project, event.ref_name), class: 'ref-name' - .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 + - if event.project != @project + %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 |