diff options
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/broadcast_messages_helper.rb | 5 | ||||
| -rw-r--r-- | app/helpers/clusters_helper.rb | 6 | ||||
| -rw-r--r-- | app/helpers/ide_helper.rb | 7 |
3 files changed, 10 insertions, 8 deletions
diff --git a/app/helpers/broadcast_messages_helper.rb b/app/helpers/broadcast_messages_helper.rb index d3a196cc0de..2f14c907b12 100644 --- a/app/helpers/broadcast_messages_helper.rb +++ b/app/helpers/broadcast_messages_helper.rb @@ -67,7 +67,10 @@ module BroadcastMessagesHelper { id: message.id, status: broadcast_message_status(message), - preview: broadcast_message(message, preview: true), + message: message.message, + theme: message.theme, + broadcast_type: message.broadcast_type, + dismissable: message.dismissable, starts_at: message.starts_at.iso8601, ends_at: message.ends_at.iso8601, target_roles: target_access_levels_display(message.target_access_levels), diff --git a/app/helpers/clusters_helper.rb b/app/helpers/clusters_helper.rb index 5d554f57cc0..b2ae1386727 100644 --- a/app/helpers/clusters_helper.rb +++ b/app/helpers/clusters_helper.rb @@ -56,7 +56,11 @@ module ClustersHelper when 'environments' render_if_exists 'clusters/clusters/environments' when 'health' - render_if_exists 'clusters/clusters/health' + if Feature.enabled?(:remove_monitor_metrics) + render('details', expanded: expanded) + else + render_if_exists 'clusters/clusters/health' + end when 'apps' render 'applications' when 'integrations' diff --git a/app/helpers/ide_helper.rb b/app/helpers/ide_helper.rb index a8dbaa4325f..0112dc6a35e 100644 --- a/app/helpers/ide_helper.rb +++ b/app/helpers/ide_helper.rb @@ -4,7 +4,6 @@ module IdeHelper # Overridden in EE def ide_data(project:, fork_info:, params:) base_data = { - 'can-use-new-web-ide' => can_use_new_web_ide?.to_s, 'use-new-web-ide' => use_new_web_ide?.to_s, 'new-web-ide-help-page-path' => help_page_path('user/project/web_ide/index.md', anchor: 'vscode-reimplementation'), 'sign-in-path' => new_session_path(current_user), @@ -24,12 +23,8 @@ module IdeHelper ) end - def can_use_new_web_ide? - Feature.enabled?(:vscode_web_ide, current_user) - end - def use_new_web_ide? - can_use_new_web_ide? && !current_user.use_legacy_web_ide + Feature.enabled?(:vscode_web_ide, current_user) end private |