summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2019-05-20 08:34:56 +0000
committerFilipa Lacerda <filipa@gitlab.com>2019-05-20 08:34:56 +0000
commit2f613f28ba286be648d4a9616404aa2a3a6b2a03 (patch)
tree307a3d0b598d85e784ce7ecd8f6e30aadbd0d8b6
parent5f261b62c773b9d59c668ff31dde86cb53096027 (diff)
parent6a6438b4bacf413eaccd51921de8d946897ff901 (diff)
downloadgitlab-ce-2f613f28ba286be648d4a9616404aa2a3a6b2a03.tar.gz
Merge branch '10444-ee-diff-commits-show' into 'master'
Move EE differences for `app/views/projects/commits/show.html.haml` Closes gitlab-ee#10444 See merge request gitlab-org/gitlab-ce!28448
-rw-r--r--app/views/projects/commits/show.html.haml2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/projects/commits/show.html.haml b/app/views/projects/commits/show.html.haml
index 9d254463fb6..2db1efdd52f 100644
--- a/app/views/projects/commits/show.html.haml
+++ b/app/views/projects/commits/show.html.haml
@@ -30,6 +30,8 @@
= link_to project_commits_path(@project, @ref, rss_url_options), title: _("Commits feed"), class: 'btn' do
= icon("rss")
+ = render_if_exists 'projects/commits/mirror_status'
+
%div{ id: dom_id(@project) }
%ol#commits-list.list-unstyled.content_list
= render 'commits', project: @project, ref: @ref