diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-15 09:10:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-15 09:10:42 +0300 |
commit | d35857c09311de5482f1a888f2d30a0cddd376ef (patch) | |
tree | b2ecf9be13f49971be3e0f348839f2b53443039c /app | |
parent | c9bdf919932b7285ef9920bdac955459340da8fe (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/whats_new/components/app.vue | 2 | ||||
-rw-r--r-- | app/helpers/services_helper.rb | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/app/assets/javascripts/whats_new/components/app.vue b/app/assets/javascripts/whats_new/components/app.vue index 9fc60fa804f..0a81f172fe9 100644 --- a/app/assets/javascripts/whats_new/components/app.vue +++ b/app/assets/javascripts/whats_new/components/app.vue @@ -95,7 +95,7 @@ export default { @close="closeDrawer" > <template #header> - <h4 class="page-title gl-my-2">{{ __("What's new at GitLab") }}</h4> + <h4 class="page-title gl-my-2">{{ __("What's new") }}</h4> </template> <template v-if="features.length"> <gl-infinite-scroll diff --git a/app/helpers/services_helper.rb b/app/helpers/services_helper.rb index 3516000e296..5f361e6653d 100644 --- a/app/helpers/services_helper.rb +++ b/app/helpers/services_helper.rb @@ -76,6 +76,8 @@ module ServicesHelper end def scoped_reset_integration_path(integration, group: nil) + return '' unless integration.persisted? + if group.present? reset_group_settings_integration_path(group, integration) else @@ -102,7 +104,7 @@ module ServicesHelper cancel_path: scoped_integrations_path, can_test: integration.can_test?.to_s, test_path: scoped_test_integration_path(integration), - reset_path: reset_integration?(integration, group: group) ? scoped_reset_integration_path(integration, group: group) : '' + reset_path: scoped_reset_integration_path(integration, group: group) } end @@ -126,10 +128,6 @@ module ServicesHelper !Gitlab.com? end - def reset_integration?(integration, group: nil) - integration.persisted? && Feature.enabled?(:reset_integrations, group, type: :development) - end - extend self private |