Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-02-20 15:34:33 +0300
committerRémy Coutable <remy@rymai.me>2017-02-20 15:34:33 +0300
commitc89449e6110c2bdf6e1410bae3e7b7d807c5e305 (patch)
tree56081e18ca5ba333e0c841a108b6f3e939621115 /app
parent6f906da36d064e3fb640fd91549f2b73a2a63c16 (diff)
parent407b491e2d994492c097b9c8878f094bb8041576 (diff)
Merge branch '28082-deleted-branch-event-404' into 'master'
Remove Link from Push Events for deleted branches Closes #28082 See merge request !9203
Diffstat (limited to 'app')
-rw-r--r--app/views/events/event/_push.html.haml8
1 files changed, 3 insertions, 5 deletions
diff --git a/app/views/events/event/_push.html.haml b/app/views/events/event/_push.html.haml
index 64ca3c32e01..efd13aabf20 100644
--- a/app/views/events/event/_push.html.haml
+++ b/app/views/events/event/_push.html.haml
@@ -3,11 +3,9 @@
.event-title
%span.author_name= link_to_author event
%span.pushed #{event.action_name} #{event.ref_type}
- - if event.rm_ref?
- %strong= event.ref_name
- - else
- %strong
- = link_to event.ref_name, namespace_project_commits_path(project.namespace, project, event.ref_name), title: h(event.target_title)
+ %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
= render "events/event_scope", event: event