diff options
| author | Phil Hughes <me@iamphill.com> | 2019-03-18 14:54:24 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-03-18 14:54:24 +0000 |
| commit | 123841f65a5a14ff60eab329edc2dd5c110cefb0 (patch) | |
| tree | fe13a3adad54752f9dd6e552873472ba7daea3f9 | |
| parent | 5e919621c6a08d3ac0b5828a7b2b3ddc72fc44af (diff) | |
| parent | 341ea03c9d4cd56cbe5c2480e868d95ef265c4ac (diff) | |
| download | gitlab-ce-123841f65a5a14ff60eab329edc2dd5c110cefb0.tar.gz | |
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
| -rw-r--r-- | app/views/clusters/clusters/_sidebar.html.haml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/clusters/clusters/_sidebar.html.haml b/app/views/clusters/clusters/_sidebar.html.haml index 6e4415c21a9..60ccad5b943 100644 --- a/app/views/clusters/clusters/_sidebar.html.haml +++ b/app/views/clusters/clusters/_sidebar.html.haml @@ -4,3 +4,5 @@ = clusterable.sidebar_text %p = clusterable.learn_more_link + += render_if_exists 'clusters/multiple_clusters_message' |