diff options
author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-11-24 11:25:23 +0100 |
---|---|---|
committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-11-25 13:45:34 +0100 |
commit | 0ba03d7eb1d80e019b9b8266f0e14356d32e7d69 (patch) | |
tree | 32d52b34bc6bf447d45bc8c19bd1e7bd4fb422a1 /app/views/events | |
parent | 5371da341e9d7768ebab8e159b3e2cc8fad1d827 (diff) | |
download | gitlab-ce-0ba03d7eb1d80e019b9b8266f0e14356d32e7d69.tar.gz |
Removed data-user-is view codeevents-cache-invalidation
With events no longer being cached this is no longer needed.
Diffstat (limited to 'app/views/events')
-rw-r--r-- | app/views/events/event/_push.html.haml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/events/event/_push.html.haml b/app/views/events/event/_push.html.haml index 44fff49d99c..64ca3c32e01 100644 --- a/app/views/events/event/_push.html.haml +++ b/app/views/events/event/_push.html.haml @@ -18,7 +18,7 @@ - few_commits.each do |commit| = render "events/commit", commit: commit, project: project, event: event - - create_mr = event.new_ref? && create_mr_button?(project.default_branch, event.ref_name, project) + - create_mr = event.new_ref? && create_mr_button?(project.default_branch, event.ref_name, project) && event.authored_by?(current_user) - if event.commits_count > 1 %li.commits-stat - if event.commits_count > 2 @@ -35,12 +35,12 @@ Compare #{from_label}...#{truncate_sha(event.commit_to)} - if create_mr - %span{"data-user-is" => event.author_id, "data-display" => "inline"} + %span or = link_to create_mr_path(project.default_branch, event.ref_name, project) do create a merge request - elsif create_mr - %li.commits-stat{"data-user-is" => event.author_id} + %li.commits-stat = link_to create_mr_path(project.default_branch, event.ref_name, project) do Create Merge Request - elsif event.rm_ref? |