diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-15 06:07:25 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-15 06:07:25 +0000 |
| commit | 00050519d16f7c0296fa0113de7065a607862501 (patch) | |
| tree | 9c7ef6b2be04e0c0167952beae22a5648e02ae93 /app | |
| parent | 94be244a9fb5da7a8b5d5fb99e5760cde17715ac (diff) | |
| download | gitlab-ce-00050519d16f7c0296fa0113de7065a607862501.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/framework/typography.scss | 2 | ||||
| -rw-r--r-- | app/policies/clusters/instance_policy.rb | 2 | ||||
| -rw-r--r-- | app/views/clusters/clusters/show.html.haml | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss index 03ddbfd9194..e36307f4f29 100644 --- a/app/assets/stylesheets/framework/typography.scss +++ b/app/assets/stylesheets/framework/typography.scss @@ -393,7 +393,7 @@ } } - .prometheus-graph-embed { + .metrics-embed { h3.popover-header { /** Override <h3> .popover-header * as embed metrics do not follow the same diff --git a/app/policies/clusters/instance_policy.rb b/app/policies/clusters/instance_policy.rb index c8e6c973bf5..d8e8f9ff2c1 100644 --- a/app/policies/clusters/instance_policy.rb +++ b/app/policies/clusters/instance_policy.rb @@ -12,3 +12,5 @@ module Clusters end end end + +Clusters::InstancePolicy.prepend_if_ee('EE::Clusters::InstancePolicy') diff --git a/app/views/clusters/clusters/show.html.haml b/app/views/clusters/clusters/show.html.haml index 8b9844bcfc1..31d5f592d75 100644 --- a/app/views/clusters/clusters/show.html.haml +++ b/app/views/clusters/clusters/show.html.haml @@ -42,6 +42,6 @@ = render 'banner' - if cluster_environments_path.present? - = render_if_exists 'clusters/clusters/group_cluster_environments', expanded: expanded + = render_if_exists 'clusters/clusters/cluster_environments', expanded: expanded - else = render 'configure', expanded: expanded |