diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 18:09:45 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 18:09:45 +0300 |
commit | aaf59610548d9b0fd01acfd50e831cbe519ecba2 (patch) | |
tree | b6505abedcd965ebae5118b504b185b63129dc4c /app | |
parent | 1363ca12f1f07c634647cf55c4c16b7401098673 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
88 files changed, 128 insertions, 91 deletions
diff --git a/app/assets/javascripts/awards_handler.js b/app/assets/javascripts/awards_handler.js index 0e403d023df..67164997bd8 100644 --- a/app/assets/javascripts/awards_handler.js +++ b/app/assets/javascripts/awards_handler.js @@ -1,4 +1,4 @@ -/* eslint-disable class-methods-use-this, @gitlab/i18n/no-non-i18n-strings */ +/* eslint-disable class-methods-use-this, @gitlab/require-i18n-strings */ import $ from 'jquery'; import _ from 'underscore'; diff --git a/app/assets/javascripts/badges/components/badge.vue b/app/assets/javascripts/badges/components/badge.vue index 00c0334db77..f9dd153eba0 100644 --- a/app/assets/javascripts/badges/components/badge.vue +++ b/app/assets/javascripts/badges/components/badge.vue @@ -4,7 +4,7 @@ import Icon from '~/vue_shared/components/icon.vue'; export default { // name: 'Badge' is a false positive: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/25 - // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings + // eslint-disable-next-line @gitlab/require-i18n-strings name: 'Badge', components: { Icon, diff --git a/app/assets/javascripts/behaviors/markdown/nodes/playable.js b/app/assets/javascripts/behaviors/markdown/nodes/playable.js index 9209c69d04a..9a2c9c3c9b0 100644 --- a/app/assets/javascripts/behaviors/markdown/nodes/playable.js +++ b/app/assets/javascripts/behaviors/markdown/nodes/playable.js @@ -1,5 +1,5 @@ /* eslint-disable class-methods-use-this */ -/* eslint-disable @gitlab/i18n/no-non-i18n-strings */ +/* eslint-disable @gitlab/require-i18n-strings */ import { Node } from 'tiptap'; import { defaultMarkdownSerializer } from 'prosemirror-markdown'; diff --git a/app/assets/javascripts/boards/components/board.js b/app/assets/javascripts/boards/components/board.js index 67046715e9b..b68a6ad0ef5 100644 --- a/app/assets/javascripts/boards/components/board.js +++ b/app/assets/javascripts/boards/components/board.js @@ -36,6 +36,7 @@ export default Vue.extend({ list: { type: Object, default: () => ({}), + required: false, }, disabled: { type: Boolean, @@ -94,7 +95,7 @@ export default Vue.extend({ return this.list.type !== ListType.blank && this.list.type !== ListType.promotion; }, uniqueKey() { - // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings + // eslint-disable-next-line @gitlab/require-i18n-strings return `boards.${this.boardId}.${this.list.type}.${this.list.id}`; }, helpLink() { diff --git a/app/assets/javascripts/boards/components/board_card.vue b/app/assets/javascripts/boards/components/board_card.vue index 0fc60528eb6..5735c8ded3d 100644 --- a/app/assets/javascripts/boards/components/board_card.vue +++ b/app/assets/javascripts/boards/components/board_card.vue @@ -13,29 +13,36 @@ export default { list: { type: Object, default: () => ({}), + required: false, }, issue: { type: Object, default: () => ({}), + required: false, }, issueLinkBase: { type: String, default: '', + required: false, }, disabled: { type: Boolean, default: false, + required: false, }, index: { type: Number, default: 0, + required: false, }, rootPath: { type: String, default: '', + required: false, }, groupId: { type: Number, + required: false, }, }, data() { diff --git a/app/assets/javascripts/boards/components/board_delete.js b/app/assets/javascripts/boards/components/board_delete.js index a06db359c94..cc15dc82db9 100644 --- a/app/assets/javascripts/boards/components/board_delete.js +++ b/app/assets/javascripts/boards/components/board_delete.js @@ -7,6 +7,7 @@ export default Vue.extend({ list: { type: Object, default: () => ({}), + required: false, }, }, methods: { diff --git a/app/assets/javascripts/boards/components/board_sidebar.js b/app/assets/javascripts/boards/components/board_sidebar.js index 9b67126bee2..a3a9753f1b5 100644 --- a/app/assets/javascripts/boards/components/board_sidebar.js +++ b/app/assets/javascripts/boards/components/board_sidebar.js @@ -34,6 +34,7 @@ export default Vue.extend({ currentUser: { type: Object, default: () => ({}), + required: false, }, }, data() { diff --git a/app/assets/javascripts/boards/components/boards_selector.vue b/app/assets/javascripts/boards/components/boards_selector.vue index fbf487357a5..f2c976be7ae 100644 --- a/app/assets/javascripts/boards/components/boards_selector.vue +++ b/app/assets/javascripts/boards/components/boards_selector.vue @@ -43,6 +43,7 @@ export default { throttleDuration: { type: Number, default: 200, + required: false, }, boardBaseUrl: { type: String, diff --git a/app/assets/javascripts/boards/components/modal/header.vue b/app/assets/javascripts/boards/components/modal/header.vue index 8cd4840d3d6..a42e691dcf3 100644 --- a/app/assets/javascripts/boards/components/modal/header.vue +++ b/app/assets/javascripts/boards/components/modal/header.vue @@ -1,5 +1,5 @@ <script> -/* eslint-disable @gitlab/vue-i18n/no-bare-strings */ +/* eslint-disable @gitlab/vue-require-i18n-strings */ import { __ } from '~/locale'; import ModalFilters from './filters'; import ModalTabs from './tabs.vue'; diff --git a/app/assets/javascripts/boards/components/modal/tabs.vue b/app/assets/javascripts/boards/components/modal/tabs.vue index 7430fc96654..ed67206218e 100644 --- a/app/assets/javascripts/boards/components/modal/tabs.vue +++ b/app/assets/javascripts/boards/components/modal/tabs.vue @@ -1,5 +1,5 @@ <script> -/* eslint-disable @gitlab/vue-i18n/no-bare-strings */ +/* eslint-disable @gitlab/vue-require-i18n-strings */ import ModalStore from '../../stores/modal_store'; import modalMixin from '../../mixins/modal_mixins'; diff --git a/app/assets/javascripts/boards/stores/actions.js b/app/assets/javascripts/boards/stores/actions.js index d4f4df3ad75..34598d66f45 100644 --- a/app/assets/javascripts/boards/stores/actions.js +++ b/app/assets/javascripts/boards/stores/actions.js @@ -1,5 +1,5 @@ const notImplemented = () => { - /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */ + /* eslint-disable-next-line @gitlab/require-i18n-strings */ throw new Error('Not implemented!'); }; diff --git a/app/assets/javascripts/boards/stores/mutations.js b/app/assets/javascripts/boards/stores/mutations.js index 09eb8bb9b98..7a287400265 100644 --- a/app/assets/javascripts/boards/stores/mutations.js +++ b/app/assets/javascripts/boards/stores/mutations.js @@ -1,7 +1,7 @@ import * as mutationTypes from './mutation_types'; const notImplemented = () => { - /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */ + /* eslint-disable-next-line @gitlab/require-i18n-strings */ throw new Error('Not implemented!'); }; diff --git a/app/assets/javascripts/clusters/components/application_row.vue b/app/assets/javascripts/clusters/components/application_row.vue index f8bf778b9e7..53bc079a4e1 100644 --- a/app/assets/javascripts/clusters/components/application_row.vue +++ b/app/assets/javascripts/clusters/components/application_row.vue @@ -1,6 +1,6 @@ <script> /* eslint-disable vue/require-default-prop */ -/* eslint-disable @gitlab/vue-i18n/no-bare-strings */ +/* eslint-disable @gitlab/vue-require-i18n-strings */ import { GlLink, GlModalDirective } from '@gitlab/ui'; import { s__, __, sprintf } from '~/locale'; import eventHub from '../event_hub'; @@ -95,6 +95,7 @@ export default { updateable: { type: Boolean, default: true, + required: false, }, updateSuccessful: { type: Boolean, diff --git a/app/assets/javascripts/clusters/components/knative_domain_editor.vue b/app/assets/javascripts/clusters/components/knative_domain_editor.vue index 66c8297cb75..30efbe2e0f7 100644 --- a/app/assets/javascripts/clusters/components/knative_domain_editor.vue +++ b/app/assets/javascripts/clusters/components/knative_domain_editor.vue @@ -22,6 +22,7 @@ export default { ingressDnsHelpPath: { type: String, default: '', + required: false, }, }, computed: { diff --git a/app/assets/javascripts/cycle_analytics/components/stage_code_component.vue b/app/assets/javascripts/cycle_analytics/components/stage_code_component.vue index 55e5f4ffad2..6b757c6972a 100644 --- a/app/assets/javascripts/cycle_analytics/components/stage_code_component.vue +++ b/app/assets/javascripts/cycle_analytics/components/stage_code_component.vue @@ -13,10 +13,12 @@ export default { items: { type: Array, default: () => [], + required: false, }, stage: { type: Object, default: () => ({}), + required: false, }, }, }; diff --git a/app/assets/javascripts/cycle_analytics/components/stage_component.vue b/app/assets/javascripts/cycle_analytics/components/stage_component.vue index c4f5172df3b..cc7ae74dd3a 100644 --- a/app/assets/javascripts/cycle_analytics/components/stage_component.vue +++ b/app/assets/javascripts/cycle_analytics/components/stage_component.vue @@ -13,10 +13,12 @@ export default { items: { type: Array, default: () => [], + required: false, }, stage: { type: Object, default: () => ({}), + required: false, }, }, }; diff --git a/app/assets/javascripts/cycle_analytics/components/stage_review_component.vue b/app/assets/javascripts/cycle_analytics/components/stage_review_component.vue index a295c8b496b..d61e6995551 100644 --- a/app/assets/javascripts/cycle_analytics/components/stage_review_component.vue +++ b/app/assets/javascripts/cycle_analytics/components/stage_review_component.vue @@ -15,10 +15,12 @@ export default { items: { type: Array, default: () => [], + required: false, }, stage: { type: Object, default: () => ({}), + required: false, }, }, }; diff --git a/app/assets/javascripts/cycle_analytics/components/stage_staging_component.vue b/app/assets/javascripts/cycle_analytics/components/stage_staging_component.vue index c5146c3bf88..2a507b7e601 100644 --- a/app/assets/javascripts/cycle_analytics/components/stage_staging_component.vue +++ b/app/assets/javascripts/cycle_analytics/components/stage_staging_component.vue @@ -16,10 +16,12 @@ export default { items: { type: Array, default: () => [], + required: false, }, stage: { type: Object, default: () => ({}), + required: false, }, }, computed: { diff --git a/app/assets/javascripts/cycle_analytics/components/stage_test_component.vue b/app/assets/javascripts/cycle_analytics/components/stage_test_component.vue index 35721384210..caff6f9c349 100644 --- a/app/assets/javascripts/cycle_analytics/components/stage_test_component.vue +++ b/app/assets/javascripts/cycle_analytics/components/stage_test_component.vue @@ -15,10 +15,12 @@ export default { items: { type: Array, default: () => [], + required: false, }, stage: { type: Object, default: () => ({}), + required: false, }, }, computed: { diff --git a/app/assets/javascripts/diffs/components/commit_item.vue b/app/assets/javascripts/diffs/components/commit_item.vue index cfffccd54eb..9d4edd84f25 100644 --- a/app/assets/javascripts/diffs/components/commit_item.vue +++ b/app/assets/javascripts/diffs/components/commit_item.vue @@ -48,7 +48,7 @@ export default { }, authorUrl() { // name: 'mailto:' is a false positive: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/26#possible-false-positives - // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings + // eslint-disable-next-line @gitlab/require-i18n-strings return this.author.web_url || `mailto:${this.commit.author_email}`; }, authorAvatar() { diff --git a/app/assets/javascripts/diffs/components/hidden_files_warning.vue b/app/assets/javascripts/diffs/components/hidden_files_warning.vue index 035c2b3b11e..ad0ca4fa402 100644 --- a/app/assets/javascripts/diffs/components/hidden_files_warning.vue +++ b/app/assets/javascripts/diffs/components/hidden_files_warning.vue @@ -1,5 +1,5 @@ <script> -/* eslint-disable @gitlab/vue-i18n/no-bare-strings */ +/* eslint-disable @gitlab/vue-require-i18n-strings */ export default { props: { total: { diff --git a/app/assets/javascripts/environments/components/environment_item.vue b/app/assets/javascripts/environments/components/environment_item.vue index 3096ccad0aa..dc489c804e9 100644 --- a/app/assets/javascripts/environments/components/environment_item.vue +++ b/app/assets/javascripts/environments/components/environment_item.vue @@ -1,5 +1,5 @@ <script> -/* eslint-disable @gitlab/vue-i18n/no-bare-strings */ +/* eslint-disable @gitlab/vue-require-i18n-strings */ import _ from 'underscore'; import { GlTooltipDirective } from '@gitlab/ui'; import { __, sprintf } from '~/locale'; @@ -342,7 +342,7 @@ export default { isLastDeployment() { // name: 'last?' is a false positive: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/26#possible-false-positives // Vue i18n ESLint rules issue: https://gitlab.com/gitlab-org/gitlab-foss/issues/63560 - // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings + // eslint-disable-next-line @gitlab/require-i18n-strings return this.model && this.model.last_deployment && this.model.last_deployment['last?']; }, diff --git a/app/assets/javascripts/environments/components/environment_rollback.vue b/app/assets/javascripts/environments/components/environment_rollback.vue index 6279bbc83ee..577e480d210 100644 --- a/app/assets/javascripts/environments/components/environment_rollback.vue +++ b/app/assets/javascripts/environments/components/environment_rollback.vue @@ -24,6 +24,7 @@ export default { isLastDeployment: { type: Boolean, default: true, + required: false, }, environment: { diff --git a/app/assets/javascripts/environments/components/stop_environment_modal.vue b/app/assets/javascripts/environments/components/stop_environment_modal.vue index 43ebd7b2824..3caf723442e 100644 --- a/app/assets/javascripts/environments/components/stop_environment_modal.vue +++ b/app/assets/javascripts/environments/components/stop_environment_modal.vue @@ -1,5 +1,5 @@ <script> -/* eslint-disable @gitlab/vue-i18n/no-bare-strings */ +/* eslint-disable @gitlab/vue-require-i18n-strings */ import { GlTooltipDirective } from '@gitlab/ui'; import DeprecatedModal2 from '~/vue_shared/components/deprecated_modal_2.vue'; import { s__, sprintf } from '~/locale'; diff --git a/app/assets/javascripts/error_tracking/utils.js b/app/assets/javascripts/error_tracking/utils.js index 3c382ccd1aa..d1cd70a72fa 100644 --- a/app/assets/javascripts/error_tracking/utils.js +++ b/app/assets/javascripts/error_tracking/utils.js @@ -1,4 +1,4 @@ -/* eslint-disable @gitlab/i18n/no-non-i18n-strings, import/prefer-default-export */ +/* eslint-disable @gitlab/require-i18n-strings, import/prefer-default-export */ /** * Tracks snowplow event when User clicks on error link to Sentry diff --git a/app/assets/javascripts/error_tracking_settings/components/error_tracking_form.vue b/app/assets/javascripts/error_tracking_settings/components/error_tracking_form.vue index 9f77fe8cd59..0be42519092 100644 --- a/app/assets/javascripts/error_tracking_settings/components/error_tracking_form.vue +++ b/app/assets/javascripts/error_tracking_settings/components/error_tracking_form.vue @@ -24,7 +24,7 @@ export default { <label class="label-bold" for="error-tracking-api-host">{{ __('Sentry API URL') }}</label> <div class="row"> <div class="col-8 col-md-9 gl-pr-0"> - <!-- eslint-disable @gitlab/vue-i18n/no-bare-attribute-strings --> + <!-- eslint-disable @gitlab/vue-require-i18n-attribute-strings --> <gl-form-input id="error-tracking-api-host" :value="apiHost" @@ -39,7 +39,7 @@ export default { ) }} </p> - <!-- eslint-enable @gitlab/vue-i18n/no-bare-attribute-strings --> + <!-- eslint-enable @gitlab/vue-require-i18n-attribute-strings --> </div> </div> </div> diff --git a/app/assets/javascripts/ide/components/branches/item.vue b/app/assets/javascripts/ide/components/branches/item.vue index 5c048749060..58a0631ee0d 100644 --- a/app/assets/javascripts/ide/components/branches/item.vue +++ b/app/assets/javascripts/ide/components/branches/item.vue @@ -1,5 +1,5 @@ <script> -/* eslint-disable @gitlab/vue-i18n/no-bare-strings */ +/* eslint-disable @gitlab/vue-require-i18n-strings */ import Icon from '~/vue_shared/components/icon.vue'; import Timeago from '~/vue_shared/components/time_ago_tooltip.vue'; import router from '../../ide_router'; diff --git a/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue b/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue index e49d96efe50..e70e251c117 100644 --- a/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue +++ b/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue @@ -38,7 +38,7 @@ export default { computed: { iconName() { // name: '-solid' is a false positive: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/26#possible-false-positives - // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings + // eslint-disable-next-line @gitlab/require-i18n-strings const suffix = this.stagedList ? '-solid' : ''; return `${getCommitIconMap(this.file).icon}${suffix}`; diff --git a/app/assets/javascripts/ide/components/ide_status_bar.vue b/app/assets/javascripts/ide/components/ide_status_bar.vue index 7ce33fd2278..5585343f367 100644 --- a/app/assets/javascripts/ide/components/ide_status_bar.vue +++ b/app/assets/javascripts/ide/components/ide_status_bar.vue @@ -1,5 +1,5 @@ <script> -/* eslint-disable @gitlab/vue-i18n/no-bare-strings */ +/* eslint-disable @gitlab/vue-require-i18n-strings */ import { mapActions, mapState, mapGetters } from 'vuex'; import IdeStatusList from 'ee_else_ce/ide/components/ide_status_list.vue'; import IdeStatusMr from './ide_status_mr.vue'; diff --git a/app/assets/javascripts/ide/components/panes/collapsible_sidebar.vue b/app/assets/javascripts/ide/components/panes/collapsible_sidebar.vue index d5a123edb80..7f65d089148 100644 --- a/app/assets/javascripts/ide/components/panes/collapsible_sidebar.vue +++ b/app/assets/javascripts/ide/components/panes/collapsible_sidebar.vue @@ -48,7 +48,7 @@ export default { }, }), namespace() { - // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings + // eslint-disable-next-line @gitlab/require-i18n-strings return `${this.side}Pane`; }, tabs() { diff --git a/app/assets/javascripts/issuable_suggestions/components/item.vue b/app/assets/javascripts/issuable_suggestions/components/item.vue index 9f3508fb937..76e4fac5107 100644 --- a/app/assets/javascripts/issuable_suggestions/components/item.vue +++ b/app/assets/javascripts/issuable_suggestions/components/item.vue @@ -1,5 +1,5 @@ <script> -/* eslint-disable @gitlab/vue-i18n/no-bare-strings */ +/* eslint-disable @gitlab/vue-require-i18n-strings */ import { uniqueId } from 'lodash'; import { GlLink, GlTooltip, GlTooltipDirective } from '@gitlab/ui'; import { __ } from '~/locale'; diff --git a/app/assets/javascripts/issue_show/components/edit_actions.vue b/app/assets/javascripts/issue_show/components/edit_actions.vue index ce867f16acf..588ae655de4 100644 --- a/app/assets/javascripts/issue_show/components/edit_actions.vue +++ b/app/assets/javascripts/issue_show/components/edit_actions.vue @@ -1,5 +1,5 @@ <script> -/* eslint-disable @gitlab/vue-i18n/no-bare-strings */ +/* eslint-disable @gitlab/vue-require-i18n-strings */ import { __, sprintf } from '~/locale'; import updateMixin from '../mixins/update'; import eventHub from '../event_hub'; diff --git a/app/assets/javascripts/issue_show/components/edited.vue b/app/assets/javascripts/issue_show/components/edited.vue index 2c92324d292..64f61a1b88e 100644 --- a/app/assets/javascripts/issue_show/components/edited.vue +++ b/app/assets/javascripts/issue_show/components/edited.vue @@ -1,5 +1,5 @@ <script> -/* eslint-disable @gitlab/vue-i18n/no-bare-strings */ +/* eslint-disable @gitlab/vue-require-i18n-strings */ import timeAgoTooltip from '../../vue_shared/components/time_ago_tooltip.vue'; export default { diff --git a/app/assets/javascripts/issue_show/components/fields/description_template.vue b/app/assets/javascripts/issue_show/components/fields/description_template.vue index bc3c81d479e..6d8a9950b6d 100644 --- a/app/assets/javascripts/issue_show/components/fields/description_template.vue +++ b/app/assets/javascripts/issue_show/components/fields/description_template.vue @@ -1,5 +1,5 @@ <script> -/* eslint-disable @gitlab/vue-i18n/no-bare-strings */ +/* eslint-disable @gitlab/vue-require-i18n-strings */ import $ from 'jquery'; import IssuableTemplateSelectors from '../../../templates/issuable_template_selectors'; diff --git a/app/assets/javascripts/jobs/components/commit_block.vue b/app/assets/javascripts/jobs/components/commit_block.vue index 8156f26ffb1..88649ddbdb7 100644 --- a/app/assets/javascripts/jobs/components/commit_block.vue +++ b/app/assets/javascripts/jobs/components/commit_block.vue @@ -1,5 +1,5 @@ <script> -/* eslint-disable @gitlab/vue-i18n/no-bare-strings */ +/* eslint-disable @gitlab/vue-require-i18n-strings */ import { GlLink } from '@gitlab/ui'; import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; diff --git a/app/assets/javascripts/lib/utils/autosave.js b/app/assets/javascripts/lib/utils/autosave.js index 37896626053..56df2532528 100644 --- a/app/assets/javascripts/lib/utils/autosave.js +++ b/app/assets/javascripts/lib/utils/autosave.js @@ -29,5 +29,5 @@ export const updateDraft = (autosaveKey, text) => { }; export const getDiscussionReplyKey = (noteableType, discussionId) => - /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */ + /* eslint-disable-next-line @gitlab/require-i18n-strings */ ['Note', capitalizeFirstCharacter(noteableType), discussionId, 'Reply'].join('/'); diff --git a/app/assets/javascripts/lib/utils/datetime_range.js b/app/assets/javascripts/lib/utils/datetime_range.js index 6d4e21cf386..9275b9e74e1 100644 --- a/app/assets/javascripts/lib/utils/datetime_range.js +++ b/app/assets/javascripts/lib/utils/datetime_range.js @@ -10,7 +10,7 @@ const durationToMillis = duration => { if (Object.entries(duration).length === 1 && Number.isFinite(duration.seconds)) { return secondsToMilliseconds(duration.seconds); } - // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings + // eslint-disable-next-line @gitlab/require-i18n-strings throw new Error('Invalid duration: only `seconds` is supported'); }; @@ -131,7 +131,7 @@ const convertOpenToFixed = ({ anchor, direction }) => { * Handles invalid date ranges */ const handleInvalidRange = () => { - // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings + // eslint-disable-next-line @gitlab/require-i18n-strings throw new Error('The input range does not have the right format.'); }; diff --git a/app/assets/javascripts/lib/utils/notify.js b/app/assets/javascripts/lib/utils/notify.js index 8db08099b3f..aa7884846a3 100644 --- a/app/assets/javascripts/lib/utils/notify.js +++ b/app/assets/javascripts/lib/utils/notify.js @@ -13,7 +13,7 @@ function notificationGranted(message, opts, onclick) { } function notifyPermissions() { - /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */ + /* eslint-disable-next-line @gitlab/require-i18n-strings */ if ('Notification' in window) { return Notification.requestPermission(); } @@ -25,7 +25,7 @@ function notifyMe(message, body, icon, onclick) { icon, }; // Let's check if the browser supports notifications - /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */ + /* eslint-disable-next-line @gitlab/require-i18n-strings */ if (!('Notification' in window)) { // do nothing } else if (Notification.permission === 'granted') { diff --git a/app/assets/javascripts/lib/utils/unit_format/formatter_factory.js b/app/assets/javascripts/lib/utils/unit_format/formatter_factory.js index 98bcb8348e2..5d3dd79850e 100644 --- a/app/assets/javascripts/lib/utils/unit_format/formatter_factory.js +++ b/app/assets/javascripts/lib/utils/unit_format/formatter_factory.js @@ -111,7 +111,7 @@ export const scaledSIFormatter = (unit = '', prefixOffset = 0) => { }); if (!units.length) { - // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings + // eslint-disable-next-line @gitlab/require-i18n-strings throw new RangeError('The unit cannot be converted, please try a different scale'); } @@ -122,7 +122,7 @@ export const scaledSIFormatter = (unit = '', prefixOffset = 0) => { * Returns a function that formats a number scaled using SI units notation. */ export const scaledBinaryFormatter = (unit = '', prefixOffset = 0) => { - // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings + // eslint-disable-next-line @gitlab/require-i18n-strings const multiplicative = ['Ki', 'Mi', 'Gi', 'Ti', 'Pi', 'Ei', 'Zi', 'Yi']; const symbols = ['', ...multiplicative]; @@ -131,7 +131,7 @@ export const scaledBinaryFormatter = (unit = '', prefixOffset = 0) => { }); if (!units.length) { - // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings + // eslint-disable-next-line @gitlab/require-i18n-strings throw new RangeError('The unit cannot be converted, please try a different scale'); } diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index 4d3a61a7627..81b2e9f13a5 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -49,7 +49,7 @@ window.$ = jQuery; // Add nonce to jQuery script handler jQuery.ajaxSetup({ converters: { - // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings, func-names + // eslint-disable-next-line @gitlab/require-i18n-strings, func-names 'text script': function(text) { jQuery.globalEval(text, { nonce: getCspNonceValue() }); return text; diff --git a/app/assets/javascripts/monitoring/components/charts/stacked_column.vue b/app/assets/javascripts/monitoring/components/charts/stacked_column.vue index 56a747b9d1f..66ba20c125f 100644 --- a/app/assets/javascripts/monitoring/components/charts/stacked_column.vue +++ b/app/assets/javascripts/monitoring/components/charts/stacked_column.vue @@ -68,7 +68,7 @@ export default { } }) .catch(e => { - // eslint-disable-next-line no-console, @gitlab/i18n/no-non-i18n-strings + // eslint-disable-next-line no-console, @gitlab/require-i18n-strings console.error('SVG could not be rendered correctly: ', e); }); }, diff --git a/app/assets/javascripts/monitoring/components/charts/time_series.vue b/app/assets/javascripts/monitoring/components/charts/time_series.vue index cba0a6da6a9..f3cbdffec64 100644 --- a/app/assets/javascripts/monitoring/components/charts/time_series.vue +++ b/app/assets/javascripts/monitoring/components/charts/time_series.vue @@ -327,7 +327,7 @@ export default { } }) .catch(e => { - // eslint-disable-next-line no-console, @gitlab/i18n/no-non-i18n-strings + // eslint-disable-next-line no-console, @gitlab/require-i18n-strings console.error('SVG could not be rendered correctly: ', e); }); }, diff --git a/app/assets/javascripts/monitoring/components/panel_type.vue b/app/assets/javascripts/monitoring/components/panel_type.vue index 4573ec58ab8..ba92b72a71d 100644 --- a/app/assets/javascripts/monitoring/components/panel_type.vue +++ b/app/assets/javascripts/monitoring/components/panel_type.vue @@ -95,7 +95,7 @@ export default { csvText() { const chartData = this.graphData.metrics[0].result[0].values; const yLabel = this.graphData.y_label; - const header = `timestamp,${yLabel}\r\n`; // eslint-disable-line @gitlab/i18n/no-non-i18n-strings + const header = `timestamp,${yLabel}\r\n`; // eslint-disable-line @gitlab/require-i18n-strings return chartData.reduce((csv, data) => { const row = data.join(','); return `${csv}${row}\r\n`; diff --git a/app/assets/javascripts/monitoring/utils.js b/app/assets/javascripts/monitoring/utils.js index 6694ae2f157..6a46c7e67e4 100644 --- a/app/assets/javascripts/monitoring/utils.js +++ b/app/assets/javascripts/monitoring/utils.js @@ -28,7 +28,7 @@ export const graphDataValidatorForValues = (isValues, graphData) => { ); }; -/* eslint-disable @gitlab/i18n/no-non-i18n-strings */ +/* eslint-disable @gitlab/require-i18n-strings */ /** * Checks that element that triggered event is located on cluster health check dashboard * @param {HTMLElement} element to check against diff --git a/app/assets/javascripts/mr_popover/components/mr_popover.vue b/app/assets/javascripts/mr_popover/components/mr_popover.vue index bbc2feae812..e6bf7a6ec02 100644 --- a/app/assets/javascripts/mr_popover/components/mr_popover.vue +++ b/app/assets/javascripts/mr_popover/components/mr_popover.vue @@ -1,5 +1,5 @@ <script> -/* eslint-disable @gitlab/vue-i18n/no-bare-strings */ +/* eslint-disable @gitlab/vue-require-i18n-strings */ import { GlPopover, GlSkeletonLoading } from '@gitlab/ui'; import CiIcon from '../../vue_shared/components/ci_icon.vue'; import timeagoMixin from '../../vue_shared/mixins/timeago'; @@ -8,7 +8,7 @@ import { mrStates, humanMRStates } from '../constants'; export default { // name: 'MRPopover' is a false positive: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/25 - name: 'MRPopover', // eslint-disable-line @gitlab/i18n/no-non-i18n-strings + name: 'MRPopover', // eslint-disable-line @gitlab/require-i18n-strings components: { GlPopover, GlSkeletonLoading, @@ -102,11 +102,11 @@ export default { <ci-icon v-if="detailedStatus" :status="detailedStatus" /> </div> <h5 class="my-2">{{ mergeRequestTitle }}</h5> - <!-- eslint-disable @gitlab/vue-i18n/no-bare-strings --> + <!-- eslint-disable @gitlab/vue-require-i18n-strings --> <div class="text-secondary"> {{ `${projectPath}!${mergeRequestIID}` }} </div> - <!-- eslint-enable @gitlab/vue-i18n/no-bare-strings --> + <!-- eslint-enable @gitlab/vue-require-i18n-strings --> </div> </gl-popover> </template> diff --git a/app/assets/javascripts/new_branch_form.js b/app/assets/javascripts/new_branch_form.js index 918c6e408a2..be3ea4e680c 100644 --- a/app/assets/javascripts/new_branch_form.js +++ b/app/assets/javascripts/new_branch_form.js @@ -1,4 +1,4 @@ -/* eslint-disable func-names, consistent-return, no-return-assign, no-else-return, @gitlab/i18n/no-non-i18n-strings */ +/* eslint-disable func-names, consistent-return, no-return-assign, no-else-return, @gitlab/require-i18n-strings */ import $ from 'jquery'; import RefSelectDropdown from './ref_select_dropdown'; diff --git a/app/assets/javascripts/notebook/cells/code/index.vue b/app/assets/javascripts/notebook/cells/code/index.vue index 470d8c87d59..e1ef9aa6d79 100644 --- a/app/assets/javascripts/notebook/cells/code/index.vue +++ b/app/assets/javascripts/notebook/cells/code/index.vue @@ -29,6 +29,7 @@ export default { metadata: { type: Object, default: () => ({}), + required: false, }, }, computed: { diff --git a/app/assets/javascripts/notebook/cells/markdown.vue b/app/assets/javascripts/notebook/cells/markdown.vue index 753aa96bb55..dab27cf8269 100644 --- a/app/assets/javascripts/notebook/cells/markdown.vue +++ b/app/assets/javascripts/notebook/cells/markdown.vue @@ -43,7 +43,7 @@ renderer.paragraph = t => { if (typeof katex !== 'undefined') { const katexString = text .replace(/&/g, '&') - .replace(/&=&/g, '\\space=\\space') // eslint-disable-line @gitlab/i18n/no-non-i18n-strings + .replace(/&=&/g, '\\space=\\space') // eslint-disable-line @gitlab/require-i18n-strings .replace(/<(\/?)em>/g, '_'); const regex = new RegExp(katexRegexString, 'gi'); const matchLocation = katexString.search(regex); diff --git a/app/assets/javascripts/notebook/cells/output/image.vue b/app/assets/javascripts/notebook/cells/output/image.vue index 842d9e8da0d..065f5def83c 100644 --- a/app/assets/javascripts/notebook/cells/output/image.vue +++ b/app/assets/javascripts/notebook/cells/output/image.vue @@ -25,7 +25,7 @@ export default { }, computed: { imgSrc() { - return `data:${this.outputType};base64,${this.rawCode}`; // eslint-disable-line @gitlab/i18n/no-non-i18n-strings + return `data:${this.outputType};base64,${this.rawCode}`; // eslint-disable-line @gitlab/require-i18n-strings }, showOutput() { return this.index === 0; diff --git a/app/assets/javascripts/notebook/cells/output/index.vue b/app/assets/javascripts/notebook/cells/output/index.vue index d8b0e099bc4..61626f7aaf5 100644 --- a/app/assets/javascripts/notebook/cells/output/index.vue +++ b/app/assets/javascripts/notebook/cells/output/index.vue @@ -22,6 +22,7 @@ export default { metadata: { type: Object, default: () => ({}), + required: false, }, }, methods: { diff --git a/app/assets/javascripts/notebook/index.vue b/app/assets/javascripts/notebook/index.vue index 4a3c1a28279..44dc1856e49 100644 --- a/app/assets/javascripts/notebook/index.vue +++ b/app/assets/javascripts/notebook/index.vue @@ -39,7 +39,7 @@ export default { }, methods: { cellType(type) { - return `${type}-cell`; // eslint-disable-line @gitlab/i18n/no-non-i18n-strings + return `${type}-cell`; // eslint-disable-line @gitlab/require-i18n-strings }, }, }; diff --git a/app/assets/javascripts/notes/components/diff_with_note.vue b/app/assets/javascripts/notes/components/diff_with_note.vue index fe22737c7fc..c3915ef299b 100644 --- a/app/assets/javascripts/notes/components/diff_with_note.vue +++ b/app/assets/javascripts/notes/components/diff_with_note.vue @@ -1,5 +1,5 @@ <script> -/* eslint-disable @gitlab/vue-i18n/no-bare-strings */ +/* eslint-disable @gitlab/vue-require-i18n-strings */ import { mapState, mapActions } from 'vuex'; import { GlSkeletonLoading } from '@gitlab/ui'; import DiffFileHeader from '~/diffs/components/diff_file_header.vue'; diff --git a/app/assets/javascripts/notes/components/note_edited_text.vue b/app/assets/javascripts/notes/components/note_edited_text.vue index 1af5af5c470..7c052320c98 100644 --- a/app/assets/javascripts/notes/components/note_edited_text.vue +++ b/app/assets/javascripts/notes/components/note_edited_text.vue @@ -1,5 +1,5 @@ <script> -/* eslint-disable @gitlab/vue-i18n/no-bare-strings */ +/* eslint-disable @gitlab/vue-require-i18n-strings */ import timeAgoTooltip from '../../vue_shared/components/time_ago_tooltip.vue'; export default { diff --git a/app/assets/javascripts/operation_settings/components/external_dashboard.vue b/app/assets/javascripts/operation_settings/components/external_dashboard.vue index 8b6467bc0f6..3594e30bd69 100644 --- a/app/assets/javascripts/operation_settings/components/external_dashboard.vue +++ b/app/assets/javascripts/operation_settings/components/external_dashboard.vue @@ -54,14 +54,14 @@ export default { :description="s__('ExternalMetrics|Enter the URL of the dashboard you want to link to')" > <!-- placeholder with a url is a false positive --> - <!-- eslint-disable @gitlab/vue-i18n/no-bare-attribute-strings --> + <!-- eslint-disable @gitlab/vue-require-i18n-attribute-strings --> <gl-form-input id="full-dashboard-url" v-model="userDashboardUrl" placeholder="https://my-org.gitlab.io/my-dashboards" @keydown.enter.native.prevent="updateExternalDashboardUrl" /> - <!-- eslint-enable @gitlab/vue-i18n/no-bare-attribute-strings --> + <!-- eslint-enable @gitlab/vue-require-i18n-attribute-strings --> </gl-form-group> <gl-button variant="success" @click="updateExternalDashboardUrl"> {{ __('Save Changes') }} diff --git a/app/assets/javascripts/pages/admin/users/index.js b/app/assets/javascripts/pages/admin/users/index.js index bc96e88351b..86c4b4f4f48 100644 --- a/app/assets/javascripts/pages/admin/users/index.js +++ b/app/assets/javascripts/pages/admin/users/index.js @@ -19,7 +19,7 @@ function loadModalsConfigurationFromHtml(modalsElement) { const modalsConfiguration = {}; if (!modalsElement) { - /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */ + /* eslint-disable-next-line @gitlab/require-i18n-strings */ throw new Error('Modals content element not found!'); } diff --git a/app/assets/javascripts/performance_bar/index.js b/app/assets/javascripts/performance_bar/index.js index 7b373a8ce22..a294f3f36a6 100644 --- a/app/assets/javascripts/performance_bar/index.js +++ b/app/assets/javascripts/performance_bar/index.js @@ -1,4 +1,4 @@ -/* eslint-disable @gitlab/i18n/no-non-i18n-strings */ +/* eslint-disable @gitlab/require-i18n-strings */ import Vue from 'vue'; import axios from '~/lib/utils/axios_utils'; diff --git a/app/assets/javascripts/pipelines/components/pipelines_artifacts.vue b/app/assets/javascripts/pipelines/components/pipelines_artifacts.vue index 3f07b77ed32..2212428ced5 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_artifacts.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_artifacts.vue @@ -1,5 +1,5 @@ <script> -/* eslint-disable @gitlab/vue-i18n/no-bare-strings */ +/* eslint-disable @gitlab/vue-require-i18n-strings */ import { GlLink, GlTooltipDirective } from '@gitlab/ui'; import Icon from '~/vue_shared/components/icon.vue'; diff --git a/app/assets/javascripts/registry/explorer/components/project_empty_state.vue b/app/assets/javascripts/registry/explorer/components/project_empty_state.vue index 53853b4b9fb..556df10ea5b 100644 --- a/app/assets/javascripts/registry/explorer/components/project_empty_state.vue +++ b/app/assets/javascripts/registry/explorer/components/project_empty_state.vue @@ -14,15 +14,15 @@ export default { computed: { ...mapState(['config']), dockerBuildCommand() { - // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings + // eslint-disable-next-line @gitlab/require-i18n-strings return `docker build -t ${this.config.repositoryUrl} .`; }, dockerPushCommand() { - // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings + // eslint-disable-next-line @gitlab/require-i18n-strings return `docker push ${this.config.repositoryUrl}`; }, dockerLoginCommand() { - // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings + // eslint-disable-next-line @gitlab/require-i18n-strings return `docker login ${this.config.registryHostUrlWithPort}`; }, }, diff --git a/app/assets/javascripts/registry/list/components/project_empty_state.vue b/app/assets/javascripts/registry/list/components/project_empty_state.vue index 80ef31004c8..900498ed03d 100644 --- a/app/assets/javascripts/registry/list/components/project_empty_state.vue +++ b/app/assets/javascripts/registry/list/components/project_empty_state.vue @@ -37,15 +37,15 @@ export default { }, computed: { dockerBuildCommand() { - // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings + // eslint-disable-next-line @gitlab/require-i18n-strings return `docker build -t ${this.repositoryUrl} .`; }, dockerPushCommand() { - // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings + // eslint-disable-next-line @gitlab/require-i18n-strings return `docker push ${this.repositoryUrl}`; }, dockerLoginCommand() { - // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings + // eslint-disable-next-line @gitlab/require-i18n-strings return `docker login ${this.registryHostUrlWithPort}`; }, noContainerImagesText() { diff --git a/app/assets/javascripts/reports/components/report_link.vue b/app/assets/javascripts/reports/components/report_link.vue index e32e1ac49ca..f285b526a54 100644 --- a/app/assets/javascripts/reports/components/report_link.vue +++ b/app/assets/javascripts/reports/components/report_link.vue @@ -1,5 +1,5 @@ <script> -/* eslint-disable @gitlab/vue-i18n/no-bare-strings */ +/* eslint-disable @gitlab/vue-require-i18n-strings */ export default { name: 'ReportIssueLink', props: { diff --git a/app/assets/javascripts/repository/components/table/row.vue b/app/assets/javascripts/repository/components/table/row.vue index f3e6e3686a3..88a7e3e3a68 100644 --- a/app/assets/javascripts/repository/components/table/row.vue +++ b/app/assets/javascripts/repository/components/table/row.vue @@ -151,7 +151,7 @@ export default { > {{ fullPath }} </component> - <!-- eslint-disable-next-line @gitlab/vue-i18n/no-bare-strings --> + <!-- eslint-disable-next-line @gitlab/vue-require-i18n-strings --> <gl-badge v-if="lfsOid" variant="default" class="label-lfs ml-1">LFS</gl-badge> <template v-if="isSubmodule"> @ <gl-link :href="submoduleTreeUrl" class="commit-sha">{{ shortSha }}</gl-link> diff --git a/app/assets/javascripts/repository/graphql.js b/app/assets/javascripts/repository/graphql.js index 265df20636b..0c68b5a599b 100644 --- a/app/assets/javascripts/repository/graphql.js +++ b/app/assets/javascripts/repository/graphql.js @@ -39,7 +39,7 @@ const defaultClient = createDefaultClient( cacheConfig: { fragmentMatcher, dataIdFromObject: obj => { - /* eslint-disable @gitlab/i18n/no-non-i18n-strings */ + /* eslint-disable @gitlab/require-i18n-strings */ // eslint-disable-next-line no-underscore-dangle switch (obj.__typename) { // We need to create a dynamic ID for each entry @@ -55,7 +55,7 @@ const defaultClient = createDefaultClient( // eslint-disable-next-line no-underscore-dangle return obj.id || obj._id; } - /* eslint-enable @gitlab/i18n/no-non-i18n-strings */ + /* eslint-enable @gitlab/require-i18n-strings */ }, }, }, diff --git a/app/assets/javascripts/repository/utils/title.js b/app/assets/javascripts/repository/utils/title.js index 9c4b334a1ce..442f6c5d741 100644 --- a/app/assets/javascripts/repository/utils/title.js +++ b/app/assets/javascripts/repository/utils/title.js @@ -9,7 +9,7 @@ export const setTitle = (pathMatch, ref, project) => { const path = pathMatch.replace(/^\//, ''); const isEmpty = path === ''; - /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */ + /* eslint-disable-next-line @gitlab/require-i18n-strings */ document.title = `${isEmpty ? 'Files' : path} · ${ref} · ${project} ${DEFAULT_TITLE}`; }; diff --git a/app/assets/javascripts/search_autocomplete.js b/app/assets/javascripts/search_autocomplete.js index 8d888a574d8..3eaa34c8a93 100644 --- a/app/assets/javascripts/search_autocomplete.js +++ b/app/assets/javascripts/search_autocomplete.js @@ -420,11 +420,11 @@ export class SearchAutocomplete { onClick(item, $el, e) { if (window.location.pathname.indexOf(item.url) !== -1) { if (!e.metaKey) e.preventDefault(); - /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */ + /* eslint-disable-next-line @gitlab/require-i18n-strings */ if (item.category === 'Projects') { this.projectInputEl.val(item.id); } - /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */ + // eslint-disable-next-line @gitlab/require-i18n-strings if (item.category === 'Groups') { this.groupInputEl.val(item.id); } diff --git a/app/assets/javascripts/sidebar/components/assignees/assignees.vue b/app/assets/javascripts/sidebar/components/assignees/assignees.vue index d9739e8d197..f16b16a6837 100644 --- a/app/assets/javascripts/sidebar/components/assignees/assignees.vue +++ b/app/assets/javascripts/sidebar/components/assignees/assignees.vue @@ -4,7 +4,7 @@ import UncollapsedAssigneeList from '../assignees/uncollapsed_assignee_list.vue' export default { // name: 'Assignees' is a false positive: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/26#possible-false-positives - // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings + // eslint-disable-next-line @gitlab/require-i18n-strings name: 'Assignees', components: { CollapsedAssigneeList, diff --git a/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue b/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue index 682ca600b6a..1e8a31fff81 100644 --- a/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue +++ b/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue @@ -40,6 +40,7 @@ export default { limitToHours: { type: Boolean, default: false, + required: false, }, rootPath: { type: String, diff --git a/app/assets/javascripts/sidebar/queries/updateStatus.mutation.graphql b/app/assets/javascripts/sidebar/queries/updateStatus.mutation.graphql index 27a5cff12c7..b45b6b46c8f 100644 --- a/app/assets/javascripts/sidebar/queries/updateStatus.mutation.graphql +++ b/app/assets/javascripts/sidebar/queries/updateStatus.mutation.graphql @@ -1,7 +1,8 @@ -mutation ($projectPath: ID!, $iid: String!, $healthStatus: HealthStatus) { - updateIssue(input: { projectPath: $projectPath, iid: $iid, healthStatus: $healthStatus}) { +mutation($projectPath: ID!, $iid: String!, $healthStatus: HealthStatus) { + updateIssue(input: { projectPath: $projectPath, iid: $iid, healthStatus: $healthStatus }) { issue { healthStatus } + errors } } diff --git a/app/assets/javascripts/snippets/components/snippet_header.vue b/app/assets/javascripts/snippets/components/snippet_header.vue index 36ba6eeecbd..bbe4c33fa43 100644 --- a/app/assets/javascripts/snippets/components/snippet_header.vue +++ b/app/assets/javascripts/snippets/components/snippet_header.vue @@ -137,7 +137,10 @@ export default { mutation: DeleteSnippetMutation, variables: { id: this.snippet.id }, }) - .then(() => { + .then(({ data }) => { + if (data?.destroySnippet?.errors) { + throw new Error(data?.destroySnippet?.errors[0]); + } this.isDeleting = false; this.errorMessage = undefined; this.closeDeleteModal(); diff --git a/app/assets/javascripts/tracking.js b/app/assets/javascripts/tracking.js index ab5acd83b01..09fe952e5f0 100644 --- a/app/assets/javascripts/tracking.js +++ b/app/assets/javascripts/tracking.js @@ -54,7 +54,7 @@ export default class Tracking { static event(category = document.body.dataset.page, action = 'generic', data = {}) { if (!this.enabled()) return false; - // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings + // eslint-disable-next-line @gitlab/require-i18n-strings if (!category) throw new Error('Tracking: no category provided for tracking.'); const { label, property, value, context } = data; diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment.vue index 9c476d5b2e0..f497936e299 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment.vue @@ -5,7 +5,7 @@ import { MANUAL_DEPLOY, WILL_DEPLOY, CREATED } from './constants'; export default { // name: 'Deployment' is a false positive: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/26#possible-false-positives - // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings + // eslint-disable-next-line @gitlab/require-i18n-strings name: 'Deployment', components: { DeploymentActions, diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue index c8e652a1305..7279aaf0809 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue @@ -1,5 +1,5 @@ <script> -/* eslint-disable @gitlab/vue-i18n/no-bare-strings */ +/* eslint-disable @gitlab/vue-require-i18n-strings */ import { GlLoadingIcon } from '@gitlab/ui'; import Flash from '~/flash'; import tooltip from '~/vue_shared/directives/tooltip'; @@ -86,7 +86,7 @@ export default { .then(res => res.data) .then(data => { // False positive i18n lint: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/26 - // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings + // eslint-disable-next-line @gitlab/require-i18n-strings if (data.message === 'Branch was deleted') { eventHub.$emit('MRWidgetUpdateRequested', () => { this.isMakingRequest = false; diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue index 8b12e8ffb73..084deee042b 100644 --- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue +++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue @@ -42,7 +42,7 @@ import { setFaviconOverlay } from '../lib/utils/common_utils'; export default { el: '#js-vue-mr-widget', // False positive i18n lint: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/25 - // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings + // eslint-disable-next-line @gitlab/require-i18n-strings name: 'MRWidget', components: { Loading, diff --git a/app/assets/javascripts/vue_shared/components/changed_file_icon.vue b/app/assets/javascripts/vue_shared/components/changed_file_icon.vue index 1bd320d81e8..60e41a16854 100644 --- a/app/assets/javascripts/vue_shared/components/changed_file_icon.vue +++ b/app/assets/javascripts/vue_shared/components/changed_file_icon.vue @@ -40,7 +40,7 @@ export default { computed: { changedIcon() { // False positive i18n lint: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/26 - // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings + // eslint-disable-next-line @gitlab/require-i18n-strings const suffix = this.file.staged && this.showStagedIcon ? '-solid' : ''; return `${getCommitIconMap(this.file).icon}${suffix}`; diff --git a/app/assets/javascripts/vue_shared/components/content_viewer/content_viewer.vue b/app/assets/javascripts/vue_shared/components/content_viewer/content_viewer.vue index 66155ddcdd9..2f5e5f35064 100644 --- a/app/assets/javascripts/vue_shared/components/content_viewer/content_viewer.vue +++ b/app/assets/javascripts/vue_shared/components/content_viewer/content_viewer.vue @@ -8,6 +8,7 @@ export default { content: { type: String, default: '', + required: false, }, path: { type: String, diff --git a/app/assets/javascripts/vue_shared/components/content_viewer/viewers/image_viewer.vue b/app/assets/javascripts/vue_shared/components/content_viewer/viewers/image_viewer.vue index 6a4a834337a..9f98943f6b4 100644 --- a/app/assets/javascripts/vue_shared/components/content_viewer/viewers/image_viewer.vue +++ b/app/assets/javascripts/vue_shared/components/content_viewer/viewers/image_viewer.vue @@ -16,6 +16,7 @@ export default { renderInfo: { type: Boolean, default: true, + required: false, }, innerCssClasses: { type: [Array, Object, String], diff --git a/app/assets/javascripts/vue_shared/components/markdown/header.vue b/app/assets/javascripts/vue_shared/components/markdown/header.vue index 36cbb230d30..bf25ed96f35 100644 --- a/app/assets/javascripts/vue_shared/components/markdown/header.vue +++ b/app/assets/javascripts/vue_shared/components/markdown/header.vue @@ -39,10 +39,10 @@ export default { mdTable() { return [ // False positive i18n lint: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/26 - '| header | header |', // eslint-disable-line @gitlab/i18n/no-non-i18n-strings + '| header | header |', // eslint-disable-line @gitlab/require-i18n-strings '| ------ | ------ |', - '| cell | cell |', // eslint-disable-line @gitlab/i18n/no-non-i18n-strings - '| cell | cell |', // eslint-disable-line @gitlab/i18n/no-non-i18n-strings + '| cell | cell |', // eslint-disable-line @gitlab/require-i18n-strings + '| cell | cell |', // eslint-disable-line @gitlab/require-i18n-strings ].join('\n'); }, mdSuggestion() { diff --git a/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue b/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue index 4da99e00165..486d4f6b609 100644 --- a/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue +++ b/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue @@ -1,5 +1,5 @@ <script> -/* eslint-disable @gitlab/vue-i18n/no-bare-strings */ +/* eslint-disable @gitlab/vue-require-i18n-strings */ import { GlLink, GlLoadingIcon } from '@gitlab/ui'; export default { diff --git a/app/assets/javascripts/vue_shared/components/project_avatar/default.vue b/app/assets/javascripts/vue_shared/components/project_avatar/default.vue index 881b5059d2a..4bc70870767 100644 --- a/app/assets/javascripts/vue_shared/components/project_avatar/default.vue +++ b/app/assets/javascripts/vue_shared/components/project_avatar/default.vue @@ -15,6 +15,7 @@ export default { size: { type: Number, default: 40, + required: false, }, }, computed: { diff --git a/app/assets/javascripts/vue_shared/components/select2_select.vue b/app/assets/javascripts/vue_shared/components/select2_select.vue index eb741d238b5..c90bd4da6c2 100644 --- a/app/assets/javascripts/vue_shared/components/select2_select.vue +++ b/app/assets/javascripts/vue_shared/components/select2_select.vue @@ -4,7 +4,7 @@ import 'select2'; export default { // False positive i18n lint: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/26 - // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings + // eslint-disable-next-line @gitlab/require-i18n-strings name: 'Select2Select', props: { options: { diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/base.vue b/app/assets/javascripts/vue_shared/components/sidebar/labels_select/base.vue index 0e401a9f7aa..44cc11a6aaa 100644 --- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/base.vue +++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select/base.vue @@ -77,12 +77,12 @@ export default { }, enableScopedLabels: { type: Boolean, - require: false, + required: false, default: false, }, scopedLabelsDocumentationLink: { type: String, - require: false, + required: false, default: '#', }, }, diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_button.vue b/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_button.vue index 1eed8907bb7..c3bc61d0053 100644 --- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_button.vue +++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_button.vue @@ -33,12 +33,12 @@ export default { }, enableScopedLabels: { type: Boolean, - require: false, + required: false, default: false, }, scopedLabelsDocumentationLink: { type: String, - require: false, + required: false, default: '#', }, }, diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/store/actions.js b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/store/actions.js index 145ec7dc566..e6053628eca 100644 --- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/store/actions.js +++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/store/actions.js @@ -45,7 +45,7 @@ export const createLabel = ({ state, dispatch }, label) => { dispatch('receiveCreateLabelSuccess'); dispatch('toggleDropdownContentsCreateView'); } else { - // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings + // eslint-disable-next-line @gitlab/require-i18n-strings throw new Error('Error Creating Label'); } }) diff --git a/app/assets/javascripts/vue_shared/components/smart_virtual_list.vue b/app/assets/javascripts/vue_shared/components/smart_virtual_list.vue index 49f987bb619..0fb7fd6cd38 100644 --- a/app/assets/javascripts/vue_shared/components/smart_virtual_list.vue +++ b/app/assets/javascripts/vue_shared/components/smart_virtual_list.vue @@ -8,9 +8,9 @@ export default { size: { type: Number, required: true }, length: { type: Number, required: true }, remain: { type: Number, required: true }, - rtag: { type: String, default: 'div' }, - wtag: { type: String, default: 'div' }, - wclass: { type: String, default: null }, + rtag: { type: String, default: 'div', required: false }, + wtag: { type: String, default: 'div', required: false }, + wclass: { type: String, default: null, required: false }, }, }; </script> diff --git a/app/assets/javascripts/vue_shared/components/stacked_progress_bar.vue b/app/assets/javascripts/vue_shared/components/stacked_progress_bar.vue index ea564d1b2f2..ec077197c9c 100644 --- a/app/assets/javascripts/vue_shared/components/stacked_progress_bar.vue +++ b/app/assets/javascripts/vue_shared/components/stacked_progress_bar.vue @@ -83,7 +83,7 @@ export default { }, barStyle(percent) { // False positive i18n lint: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/26 - // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings + // eslint-disable-next-line @gitlab/require-i18n-strings return `width: ${percent}%;`; }, getTooltip(label, count) { diff --git a/app/controllers/admin/concerns/authenticates_2fa_for_admin_mode.rb b/app/controllers/concerns/authenticates_2fa_for_admin_mode.rb index c6fd1d55e51..c6fd1d55e51 100644 --- a/app/controllers/admin/concerns/authenticates_2fa_for_admin_mode.rb +++ b/app/controllers/concerns/authenticates_2fa_for_admin_mode.rb diff --git a/app/graphql/types/group_type.rb b/app/graphql/types/group_type.rb index 699aa51e6c8..bd9efef94f8 100644 --- a/app/graphql/types/group_type.rb +++ b/app/graphql/types/group_type.rb @@ -51,6 +51,7 @@ module Types Types::BoardType.connection_type, null: true, description: 'Boards of the group', + max_page_size: 2000, resolver: Resolvers::BoardsResolver field :board, diff --git a/app/graphql/types/project_type.rb b/app/graphql/types/project_type.rb index 1142459f6eb..5c0b9182ac5 100644 --- a/app/graphql/types/project_type.rb +++ b/app/graphql/types/project_type.rb @@ -184,6 +184,7 @@ module Types Types::BoardType.connection_type, null: true, description: 'Boards of the project', + max_page_size: 2000, resolver: Resolvers::BoardsResolver field :board, diff --git a/app/models/issue.rb b/app/models/issue.rb index 145807457a1..3d389013985 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -68,6 +68,7 @@ class Issue < ApplicationRecord scope :order_closest_future_date, -> { reorder(Arel.sql('CASE WHEN issues.due_date >= CURRENT_DATE THEN 0 ELSE 1 END ASC, ABS(CURRENT_DATE - issues.due_date) ASC')) } scope :order_relative_position_asc, -> { reorder(::Gitlab::Database.nulls_last_order('relative_position', 'ASC')) } scope :order_closed_date_desc, -> { reorder(closed_at: :desc) } + scope :order_created_at_desc, -> { reorder(created_at: :desc) } scope :preload_associated_models, -> { preload(:labels, project: :namespace) } scope :with_api_entity_associations, -> { preload(:timelogs, :assignees, :author, :notes, :labels, project: [:route, { namespace: :route }] ) } |