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>2022-03-30 12:08:12 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-03-30 12:08:12 +0300
commitdf2358a5f7a8fe32285ac62054314287fb871e49 (patch)
tree7f4da32a9df0128f82d415cfab38577a2ca438fb /app/assets/javascripts/snippets
parent9e83c35c6aecec7543d24d9386bd4821c97e5310 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/snippets')
-rw-r--r--app/assets/javascripts/snippets/components/edit.vue10
-rw-r--r--app/assets/javascripts/snippets/components/snippet_header.vue8
-rw-r--r--app/assets/javascripts/snippets/fragments/snippet_base.fragment.graphql (renamed from app/assets/javascripts/snippets/fragments/snippetBase.fragment.graphql)0
-rw-r--r--app/assets/javascripts/snippets/mutations/create_snippet.mutation.graphql (renamed from app/assets/javascripts/snippets/mutations/createSnippet.mutation.graphql)0
-rw-r--r--app/assets/javascripts/snippets/mutations/delete_snippet.mutation.graphql (renamed from app/assets/javascripts/snippets/mutations/deleteSnippet.mutation.graphql)0
-rw-r--r--app/assets/javascripts/snippets/mutations/update_snippet.mutation.graphql (renamed from app/assets/javascripts/snippets/mutations/updateSnippet.mutation.graphql)0
6 files changed, 9 insertions, 9 deletions
diff --git a/app/assets/javascripts/snippets/components/edit.vue b/app/assets/javascripts/snippets/components/edit.vue
index e3aa29d5f89..e4a97f08c8d 100644
--- a/app/assets/javascripts/snippets/components/edit.vue
+++ b/app/assets/javascripts/snippets/components/edit.vue
@@ -15,8 +15,8 @@ import TitleField from '~/vue_shared/components/form/title.vue';
import { SNIPPET_CREATE_MUTATION_ERROR, SNIPPET_UPDATE_MUTATION_ERROR } from '../constants';
import { getSnippetMixin } from '../mixins/snippets';
-import CreateSnippetMutation from '../mutations/createSnippet.mutation.graphql';
-import UpdateSnippetMutation from '../mutations/updateSnippet.mutation.graphql';
+import CreateSnippetMutation from '../mutations/create_snippet.mutation.graphql';
+import UpdateSnippetMutation from '../mutations/update_snippet.mutation.graphql';
import { markBlobPerformance } from '../utils/blob';
import { getErrorMessage } from '../utils/error';
@@ -238,9 +238,9 @@ export default {
>
</template>
<template #append>
- <gl-button type="cancel" data-testid="snippet-cancel-btn" :href="cancelButtonHref">{{
- __('Cancel')
- }}</gl-button>
+ <gl-button type="cancel" data-testid="snippet-cancel-btn" :href="cancelButtonHref">
+ {{ __('Cancel') }}
+ </gl-button>
</template>
</form-footer-actions>
</template>
diff --git a/app/assets/javascripts/snippets/components/snippet_header.vue b/app/assets/javascripts/snippets/components/snippet_header.vue
index 9b24c8afe37..dd8f2897018 100644
--- a/app/assets/javascripts/snippets/components/snippet_header.vue
+++ b/app/assets/javascripts/snippets/components/snippet_header.vue
@@ -21,7 +21,7 @@ import { __, s__, sprintf } from '~/locale';
import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
import createFlash, { FLASH_TYPES } from '~/flash';
-import DeleteSnippetMutation from '../mutations/deleteSnippet.mutation.graphql';
+import DeleteSnippetMutation from '../mutations/delete_snippet.mutation.graphql';
export const i18n = {
snippetSpamSuccess: sprintf(
@@ -294,9 +294,9 @@ export default {
<gl-modal ref="deleteModal" modal-id="delete-modal" title="Example title">
<template #modal-title>{{ __('Delete snippet?') }}</template>
- <gl-alert v-if="errorMessage" variant="danger" class="mb-2" @dismiss="errorMessage = ''">
- {{ errorMessage }}
- </gl-alert>
+ <gl-alert v-if="errorMessage" variant="danger" class="mb-2" @dismiss="errorMessage = ''">{{
+ errorMessage
+ }}</gl-alert>
<gl-sprintf :message="__('Are you sure you want to delete %{name}?')">
<template #name>
diff --git a/app/assets/javascripts/snippets/fragments/snippetBase.fragment.graphql b/app/assets/javascripts/snippets/fragments/snippet_base.fragment.graphql
index d75b4011d1c..d75b4011d1c 100644
--- a/app/assets/javascripts/snippets/fragments/snippetBase.fragment.graphql
+++ b/app/assets/javascripts/snippets/fragments/snippet_base.fragment.graphql
diff --git a/app/assets/javascripts/snippets/mutations/createSnippet.mutation.graphql b/app/assets/javascripts/snippets/mutations/create_snippet.mutation.graphql
index 8640c4725f4..8640c4725f4 100644
--- a/app/assets/javascripts/snippets/mutations/createSnippet.mutation.graphql
+++ b/app/assets/javascripts/snippets/mutations/create_snippet.mutation.graphql
diff --git a/app/assets/javascripts/snippets/mutations/deleteSnippet.mutation.graphql b/app/assets/javascripts/snippets/mutations/delete_snippet.mutation.graphql
index f43d53661f4..f43d53661f4 100644
--- a/app/assets/javascripts/snippets/mutations/deleteSnippet.mutation.graphql
+++ b/app/assets/javascripts/snippets/mutations/delete_snippet.mutation.graphql
diff --git a/app/assets/javascripts/snippets/mutations/updateSnippet.mutation.graphql b/app/assets/javascripts/snippets/mutations/update_snippet.mutation.graphql
index 99242c5d500..99242c5d500 100644
--- a/app/assets/javascripts/snippets/mutations/updateSnippet.mutation.graphql
+++ b/app/assets/javascripts/snippets/mutations/update_snippet.mutation.graphql