diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-14 09:10:12 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-14 09:10:12 +0300 |
| commit | bfa9edfd26edc8800556399ebb4c52c5f61a69a6 (patch) | |
| tree | e7969cdb4bba6b44581858627b0df6938e97f1c1 /app/assets/javascripts/integrations | |
| parent | f5a8ebd6b7da5501100d66b43050be7b26b04665 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/integrations')
| -rw-r--r-- | app/assets/javascripts/integrations/edit/components/override_dropdown.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/integrations/edit/components/override_dropdown.vue b/app/assets/javascripts/integrations/edit/components/override_dropdown.vue index 0ae2f267434..61a8d809793 100644 --- a/app/assets/javascripts/integrations/edit/components/override_dropdown.vue +++ b/app/assets/javascripts/integrations/edit/components/override_dropdown.vue @@ -5,7 +5,7 @@ import { GlNewDropdown, GlNewDropdownItem } from '@gitlab/ui'; const dropdownOptions = [ { value: false, - text: s__('Integrations|Use instance level settings'), + text: s__('Integrations|Use default settings'), }, { value: true, @@ -48,7 +48,7 @@ export default { <div class="gl-display-flex gl-justify-content-space-between gl-align-items-baseline gl-py-4 gl-mt-5 gl-mb-6 gl-border-t-1 gl-border-t-solid gl-border-b-1 gl-border-b-solid gl-border-gray-100" > - <span>{{ s__('Integrations|This integration has multiple settings available.') }}</span> + <span>{{ s__('Integrations|Default settings are inherited from the instance level.') }}</span> <input name="service[inherit_from_id]" :value="override ? '' : inheritFromId" type="hidden" /> <gl-new-dropdown :text="selected.text"> <gl-new-dropdown-item |