diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-11-02 12:34:40 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-11-02 12:34:40 +0000 |
| commit | 46fd31594e166b17d1c0ca232b6acdd09c1b1cdb (patch) | |
| tree | 28a50ec6870fb9eb977116079efe789a419f4306 /app/helpers | |
| parent | 473262a04b098396c0633436c0e9572561d332c7 (diff) | |
| parent | fec21f5542b4b50cb1e49a6c50c8b4d57fa9f62e (diff) | |
| download | gitlab-ce-46fd31594e166b17d1c0ca232b6acdd09c1b1cdb.tar.gz | |
Merge branch 'top_level_clusters_controller' into 'master'
Top level clusters controller
See merge request gitlab-org/gitlab-ce!22438
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/clusters_helper.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/helpers/clusters_helper.rb b/app/helpers/clusters_helper.rb index 19eb763e1de..916dcb1a308 100644 --- a/app/helpers/clusters_helper.rb +++ b/app/helpers/clusters_helper.rb @@ -1,7 +1,8 @@ # frozen_string_literal: true module ClustersHelper - def has_multiple_clusters?(project) + # EE overrides this + def has_multiple_clusters? false end @@ -10,7 +11,7 @@ module ClustersHelper return unless show_gcp_signup_offer? content_tag :section, class: 'no-animate expanded' do - render 'projects/clusters/gcp_signup_offer_banner' + render 'clusters/clusters/gcp_signup_offer_banner' end end end |