Commit 123841f6 authored by Phil Hughes's avatar Phil Hughes

Merge branch '10428-cluster-sidebar' into 'master'

Removes EE differences for clusters/_sidebar.html.haml

Closes gitlab-ee#10428

See merge request gitlab-org/gitlab-ce!26271
parents 5e919621 341ea03c
...@@ -4,3 +4,5 @@ ...@@ -4,3 +4,5 @@
= clusterable.sidebar_text = clusterable.sidebar_text
%p %p
= clusterable.learn_more_link = clusterable.learn_more_link
= render_if_exists 'clusters/multiple_clusters_message'
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment