Commit 3944a544 authored by Luke Duncalfe's avatar Luke Duncalfe

Merge branch '218252-group-integrtaion-override-fix' into 'master'

Don't show integrations overrides tab at group level

See merge request gitlab-org/gitlab!68329
parents ee956e0d 741f3fc2
...@@ -128,7 +128,9 @@ module IntegrationsHelper ...@@ -128,7 +128,9 @@ module IntegrationsHelper
def integration_tabs(integration:) def integration_tabs(integration:)
[ [
{ key: 'edit', text: _('Settings'), href: scoped_edit_integration_path(integration) }, { key: 'edit', text: _('Settings'), href: scoped_edit_integration_path(integration) },
({ key: 'overrides', text: s_('Integrations|Projects using custom settings'), href: scoped_overrides_integration_path(integration) } if instance_level_integration_overrides?) (
{ key: 'overrides', text: s_('Integrations|Projects using custom settings'), href: scoped_overrides_integration_path(integration) } if integration.instance_level? && instance_level_integration_overrides?
)
].compact ].compact
end end
......
...@@ -13,4 +13,9 @@ RSpec.describe 'User activates the group-level Mattermost Slash Command integrat ...@@ -13,4 +13,9 @@ RSpec.describe 'User activates the group-level Mattermost Slash Command integrat
let(:edit_path) { edit_group_settings_integration_path(group, :mattermost_slash_commands) } let(:edit_path) { edit_group_settings_integration_path(group, :mattermost_slash_commands) }
include_examples 'user activates the Mattermost Slash Command integration' include_examples 'user activates the Mattermost Slash Command integration'
it 'does not display the overrides tab' do
expect(page).not_to have_link('Settings', href: edit_path)
expect(page).not_to have_link('Projects using custom settings', href: overrides_admin_application_settings_integration_path(:mattermost_slash_commands))
end
end end
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