Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-03 12:09:31 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-03 12:09:31 +0300
commit04baa85554ff13bdd4d6f4e6bb24119d17608fee (patch)
tree7cb9c0977e09d97da340f48703d79b2dbd3579a0 /app/assets/javascripts/grafana_integration
parent42f41de46525ce0065f02ee07c1a79f5669526a0 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/grafana_integration')
-rw-r--r--app/assets/javascripts/grafana_integration/components/grafana_integration.vue10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/grafana_integration/components/grafana_integration.vue b/app/assets/javascripts/grafana_integration/components/grafana_integration.vue
index 22cafd50bf3..5295b2197d5 100644
--- a/app/assets/javascripts/grafana_integration/components/grafana_integration.vue
+++ b/app/assets/javascripts/grafana_integration/components/grafana_integration.vue
@@ -1,11 +1,11 @@
<script>
-import { GlButton, GlFormGroup, GlFormInput, GlFormCheckbox } from '@gitlab/ui';
+import { GlDeprecatedButton, GlFormGroup, GlFormInput, GlFormCheckbox } from '@gitlab/ui';
import { mapState, mapActions } from 'vuex';
import Icon from '~/vue_shared/components/icon.vue';
export default {
components: {
- GlButton,
+ GlDeprecatedButton,
GlFormCheckbox,
GlFormGroup,
GlFormInput,
@@ -58,7 +58,7 @@ export default {
<h3 class="js-section-header h4">
{{ s__('GrafanaIntegration|Grafana Authentication') }}
</h3>
- <gl-button class="js-settings-toggle">{{ __('Expand') }}</gl-button>
+ <gl-deprecated-button class="js-settings-toggle">{{ __('Expand') }}</gl-deprecated-button>
<p class="js-section-sub-header">
{{ s__('GrafanaIntegration|Embed Grafana charts in GitLab issues.') }}
</p>
@@ -93,9 +93,9 @@ export default {
</a>
</p>
</gl-form-group>
- <gl-button variant="success" @click="updateGrafanaIntegration">
+ <gl-deprecated-button variant="success" @click="updateGrafanaIntegration">
{{ __('Save Changes') }}
- </gl-button>
+ </gl-deprecated-button>
</form>
</div>
</section>