diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-02-20 12:34:33 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-02-20 12:34:33 +0000 |
| commit | c89449e6110c2bdf6e1410bae3e7b7d807c5e305 (patch) | |
| tree | 56081e18ca5ba333e0c841a108b6f3e939621115 | |
| parent | 6f906da36d064e3fb640fd91549f2b73a2a63c16 (diff) | |
| parent | 407b491e2d994492c097b9c8878f094bb8041576 (diff) | |
| download | gitlab-ce-c89449e6110c2bdf6e1410bae3e7b7d807c5e305.tar.gz | |
Merge branch '28082-deleted-branch-event-404' into 'master'
Remove Link from Push Events for deleted branches
Closes #28082
See merge request !9203
| -rw-r--r-- | app/views/events/event/_push.html.haml | 8 | ||||
| -rw-r--r-- | changelogs/unreleased/28082-deleted-branch-event-404.yml | 4 |
2 files changed, 7 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 diff --git a/changelogs/unreleased/28082-deleted-branch-event-404.yml b/changelogs/unreleased/28082-deleted-branch-event-404.yml new file mode 100644 index 00000000000..e989ca34784 --- /dev/null +++ b/changelogs/unreleased/28082-deleted-branch-event-404.yml @@ -0,0 +1,4 @@ +--- +title: Stop linking to deleted Branches in Activity tabs +merge_request: 9203 +author: Jan Christophersen |