diff options
189 files changed, 2068 insertions, 1159 deletions
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 4d84f9747ad..1eafd024f5e 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -112,6 +112,7 @@ .workhorse-patterns: &workhorse-patterns - "GITLAB_WORKHORSE_VERSION" - "workhorse/**/*" + - ".gitlab/ci/workhorse.gitlab-ci.yml" .yaml-lint-patterns: &yaml-lint-patterns - ".gitlab-ci.yml" diff --git a/.gitlab/ci/workhorse.gitlab-ci.yml b/.gitlab/ci/workhorse.gitlab-ci.yml index 81016dbfb53..a40eebd131b 100644 --- a/.gitlab/ci/workhorse.gitlab-ci.yml +++ b/.gitlab/ci/workhorse.gitlab-ci.yml @@ -8,3 +8,39 @@ workhorse: - git checkout . - scripts/update-workhorse check - make -C workhorse + +workhorse:verify: + extends: .workhorse:rules:workhorse + image: ${GITLAB_DEPENDENCY_PROXY}golang:1.15 + stage: test + needs: [] + script: + - make -C workhorse verify + +.workhorse:test: + extends: .workhorse:rules:workhorse + services: + - name: registry.gitlab.com/gitlab-org/build/cng/gitaly:latest + # Disable the hooks so we don't have to stub the GitLab API + command: ["/usr/bin/env", "GITALY_TESTING_NO_GIT_HOOKS=1", "/scripts/process-wrapper"] + alias: gitaly + variables: + GITALY_ADDRESS: "tcp://gitaly:8075" + stage: test + needs: [] + script: + - go version + - apt-get update && apt-get -y install libimage-exiftool-perl + - make -C workhorse test + +workhorse:test using go 1.13: + extends: .workhorse:test + image: ${GITLAB_DEPENDENCY_PROXY}golang:1.13 + +workhorse:test using go 1.14: + extends: .workhorse:test + image: ${GITLAB_DEPENDENCY_PROXY}golang:1.14 + +workhorse:test using go 1.15: + extends: .workhorse:test + image: ${GITLAB_DEPENDENCY_PROXY}golang:1.15 diff --git a/.gitlab/issue_templates/Actionable Insight.md b/.gitlab/issue_templates/Actionable Insight.md index b84af21199d..df519f81799 100644 --- a/.gitlab/issue_templates/Actionable Insight.md +++ b/.gitlab/issue_templates/Actionable Insight.md @@ -1,20 +1,20 @@ -<!-- Actionable insights must recommend an action that needs to take place. An actionable insight both defines the _insight_ and clearly calls out _action_ or next step required to improve based on the result of the research observation or data. Actionable insights are tracked over time and will include follow-up. Learn more in the handbook here: https://about.gitlab.com/handbook/engineering/ux/ux-research-training/research-insights/#actionable-insights --> +<!-- Actionable insights must recommend an action that needs to take place. An actionable insight both defines the insight and clearly calls out action or next step required to improve based on the result of the research observation or data. Actionable insights are tracked over time and will include follow-up. Learn more in the handbook here: https://about.gitlab.com/handbook/engineering/ux/ux-research-training/research-insights/#actionable-insights --> ### Insight -<!-- Describe the insight itself: often the problem, finding, or observation. _What_ is currently happening? --> +<!-- Describe the insight itself: often the problem, finding, or observation. --> ### Supporting evidence -<!-- Describe _why_ the problem is happening, or more details behind the finding or observation. Try to include quotes or specific data collected. Feel free to link the Actionable insight from Dovetail here if applicable instead of retyping details. --> +<!-- Describe why the problem is happening, or more details behind the finding or observation. Try to include quotes or specific data collected. Feel free to link the Actionable insight from Dovetail here if applicable instead of retyping details. --> ### Action -<!--Describe the next step or action that needs to take place as a result of the research. The action should be clearly defined, achievable, and directly tied back to the insight. Make sure to use directive terminology, such as: conduct, explore, redesign, etc. _How_ do we take a step toward improving the experience? --> +<!--Describe the next step or action that needs to take place as a result of the research. The action should be clearly defined, achievable, and directly tied back to the insight. Make sure to use directive terminology, such as: conduct, explore, redesign, etc. --> ### Resources <!--Add resources as links below or as related issues. --> -- **Dovetail link:** [{Paste URL here}](url) -- **Research issue link:** [{Paste URL here}](url) -- **Follow-up issue:** [{Paste URL here}](url) +- :dove: [Dovetail project](Paste URL for Dovetail project here) +- :mag: [Research issue](Paste URL for research issue here) +- :footprints: [Follow-up issue or epic](Paste URL for follow-up issue or epic here) ### Tasks - [ ] Assign this issue to the appropriate Product Manager, Product Designer, or UX Researcher. diff --git a/.rubocop_manual_todo.yml b/.rubocop_manual_todo.yml index 9517b932b86..bdd389e93bc 100644 --- a/.rubocop_manual_todo.yml +++ b/.rubocop_manual_todo.yml @@ -2648,87 +2648,6 @@ Style/FrozenStringLiteralComment: - 'bin/secpick' - 'danger/changes_size/Dangerfile' - 'danger/metadata/Dangerfile' - - 'ee/lib/tasks/geo.rake' - - 'ee/lib/tasks/geo/git.rake' - - 'ee/lib/tasks/geo/replication.rake' - - 'ee/lib/tasks/gitlab/db.rake' - - 'ee/lib/tasks/gitlab/elastic.rake' - - 'ee/lib/tasks/gitlab/elastic/test.rake' - - 'ee/lib/tasks/gitlab/geo.rake' - - 'ee/lib/tasks/gitlab/indexer.rake' - - 'ee/lib/tasks/gitlab/ldap.rake' - - 'ee/lib/tasks/gitlab/seed/insights.rake' - - 'ee/lib/tasks/gitlab/seed/metrics.rake' - - 'ee/lib/tasks/migrate/ldap.rake' - - 'lib/tasks/brakeman.rake' - - 'lib/tasks/cache.rake' - - 'lib/tasks/ci/cleanup.rake' - - 'lib/tasks/cleanup.rake' - - 'lib/tasks/config_lint.rake' - - 'lib/tasks/db_obsolete_ignored_columns.rake' - - 'lib/tasks/dev.rake' - - 'lib/tasks/downtime_check.rake' - - 'lib/tasks/eslint.rake' - - 'lib/tasks/file_hooks.rake' - - 'lib/tasks/frontend.rake' - - 'lib/tasks/gemojione.rake' - - 'lib/tasks/gitlab/artifacts/check.rake' - - 'lib/tasks/gitlab/artifacts/migrate.rake' - - 'lib/tasks/gitlab/backup.rake' - - 'lib/tasks/gitlab/bulk_add_permission.rake' - - 'lib/tasks/gitlab/check.rake' - - 'lib/tasks/gitlab/container_registry.rake' - - 'lib/tasks/gitlab/db.rake' - - 'lib/tasks/gitlab/doctor/secrets.rake' - - 'lib/tasks/gitlab/exclusive_lease.rake' - - 'lib/tasks/gitlab/external_diffs.rake' - - 'lib/tasks/gitlab/features.rake' - - 'lib/tasks/gitlab/generate_sample_prometheus_data.rake' - - 'lib/tasks/gitlab/git.rake' - - 'lib/tasks/gitlab/gitaly.rake' - - 'lib/tasks/gitlab/helpers.rake' - - 'lib/tasks/gitlab/import.rake' - - 'lib/tasks/gitlab/import_export.rake' - - 'lib/tasks/gitlab/info.rake' - - 'lib/tasks/gitlab/ldap.rake' - - 'lib/tasks/gitlab/lfs/check.rake' - - 'lib/tasks/gitlab/lfs/migrate.rake' - - 'lib/tasks/gitlab/list_repos.rake' - - 'lib/tasks/gitlab/packages/events.rake' - - 'lib/tasks/gitlab/packages/migrate.rake' - - 'lib/tasks/gitlab/pages.rake' - - 'lib/tasks/gitlab/praefect.rake' - - 'lib/tasks/gitlab/seed.rake' - - 'lib/tasks/gitlab/setup.rake' - - 'lib/tasks/gitlab/shell.rake' - - 'lib/tasks/gitlab/storage.rake' - - 'lib/tasks/gitlab/tcp_check.rake' - - 'lib/tasks/gitlab/test.rake' - - 'lib/tasks/gitlab/two_factor.rake' - - 'lib/tasks/gitlab/update_templates.rake' - - 'lib/tasks/gitlab/uploads/check.rake' - - 'lib/tasks/gitlab/uploads/migrate.rake' - - 'lib/tasks/gitlab/uploads/sanitize.rake' - - 'lib/tasks/gitlab/usage_data.rake' - - 'lib/tasks/gitlab/user_management.rake' - - 'lib/tasks/gitlab/web_hook.rake' - - 'lib/tasks/gitlab/workhorse.rake' - - 'lib/tasks/gitlab/x509/update.rake' - - 'lib/tasks/gitlab_danger.rake' - - 'lib/tasks/grape.rake' - - 'lib/tasks/haml-lint.rake' - - 'lib/tasks/import.rake' - - 'lib/tasks/karma.rake' - - 'lib/tasks/lint.rake' - - 'lib/tasks/migrate/composite_primary_keys.rake' - - 'lib/tasks/migrate/migrate_iids.rake' - - 'lib/tasks/migrate/setup_postgresql.rake' - - 'lib/tasks/pngquant.rake' - - 'lib/tasks/rubocop.rake' - - 'lib/tasks/scss-lint.rake' - - 'lib/tasks/setup.rake' - - 'lib/tasks/test.rake' - - 'lib/tasks/tokens.rake' - 'qa/Gemfile' - 'qa/Rakefile' - 'qa/bin/qa' diff --git a/app/assets/javascripts/admin/statistics_panel/index.js b/app/assets/javascripts/admin/statistics_panel/index.js index 8c49fffe630..2f8c3d2e167 100644 --- a/app/assets/javascripts/admin/statistics_panel/index.js +++ b/app/assets/javascripts/admin/statistics_panel/index.js @@ -2,7 +2,7 @@ import Vue from 'vue'; import StatisticsPanelApp from './components/app.vue'; import createStore from './store'; -export default function (el) { +export default function initStatisticsPanel(el) { if (!el) { return false; } diff --git a/app/assets/javascripts/boards/stores/boards_store.js b/app/assets/javascripts/boards/stores/boards_store.js index f59530ddf8f..e3d57d9bb9e 100644 --- a/app/assets/javascripts/boards/stores/boards_store.js +++ b/app/assets/javascripts/boards/stores/boards_store.js @@ -117,7 +117,6 @@ const boardsStore = { }, updateNewListDropdown(listId) { - // eslint-disable-next-line no-unused-expressions document .querySelector(`.js-board-list-${getIdFromGraphQLId(listId)}`) ?.classList.remove('is-active'); diff --git a/app/assets/javascripts/issuable_suggestions/index.js b/app/assets/javascripts/issuable_suggestions/index.js index 9949527106b..8f7f317d6b4 100644 --- a/app/assets/javascripts/issuable_suggestions/index.js +++ b/app/assets/javascripts/issuable_suggestions/index.js @@ -5,7 +5,7 @@ import App from './components/app.vue'; Vue.use(VueApollo); -export default function () { +export default function initIssuableSuggestions() { const el = document.getElementById('js-suggestions'); const issueTitle = document.getElementById('issue_title'); const { projectPath } = el.dataset; diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index f1900ea5f7e..71dffe744fb 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -71,7 +71,7 @@ if (gon?.disable_animations) { // inject test utilities if necessary if (process.env.NODE_ENV !== 'production' && gon?.test_env) { disableJQueryAnimations(); - import(/* webpackMode: "eager" */ './test_utils/'); // eslint-disable-line no-unused-expressions + import(/* webpackMode: "eager" */ './test_utils/'); } document.addEventListener('beforeunload', () => { diff --git a/app/assets/javascripts/notes/stores/actions.js b/app/assets/javascripts/notes/stores/actions.js index ddc6c44a4e5..d3ea1f56037 100644 --- a/app/assets/javascripts/notes/stores/actions.js +++ b/app/assets/javascripts/notes/stores/actions.js @@ -739,9 +739,13 @@ export const updateConfidentialityOnIssuable = ( }) .then(({ data }) => { const { - issueSetConfidential: { issue }, + issueSetConfidential: { issue, errors }, } = data; - setConfidentiality({ commit }, issue.confidential); + if (errors?.length) { + Flash(errors[0], 'alert'); + } else { + setConfidentiality({ commit }, issue.confidential); + } }); }; diff --git a/app/assets/javascripts/packages_and_registries/settings/group/components/group_settings_app.vue b/app/assets/javascripts/packages_and_registries/settings/group/components/group_settings_app.vue index 31abdc730f8..71f683a1761 100644 --- a/app/assets/javascripts/packages_and_registries/settings/group/components/group_settings_app.vue +++ b/app/assets/javascripts/packages_and_registries/settings/group/components/group_settings_app.vue @@ -1,13 +1,20 @@ <script> import { GlSprintf, GlLink } from '@gitlab/ui'; +import createFlash from '~/flash'; import SettingsBlock from '~/vue_shared/components/settings/settings_block.vue'; +import MavenSettings from '~/packages_and_registries/settings/group/components/maven_settings.vue'; import { PACKAGE_SETTINGS_HEADER, PACKAGE_SETTINGS_DESCRIPTION, PACKAGES_DOCS_PATH, -} from '../constants'; -import getGroupPackagesSettingsQuery from '../graphql/queries/get_group_packages_settings.query.graphql'; + ERROR_UPDATING_SETTINGS, + SUCCESS_UPDATING_SETTINGS, +} from '~/packages_and_registries/settings/group/constants'; +import { updateGroupPackageSettings } from '~/packages_and_registries/settings/group/graphql/utils/cache_update'; +import { updateGroupPackagesSettingsOptimisticResponse } from '~/packages_and_registries/settings/group/graphql/utils/optimistic_responses'; +import getGroupPackagesSettingsQuery from '~/packages_and_registries/settings/group/graphql/queries/get_group_packages_settings.query.graphql'; +import updateNamespacePackageSettings from '~/packages_and_registries/settings/group/graphql/mutations/update_group_packages_settings.mutation.graphql'; export default { name: 'GroupSettingsApp', @@ -22,18 +29,9 @@ export default { GlSprintf, GlLink, SettingsBlock, + MavenSettings, }, - inject: { - defaultExpanded: { - type: Boolean, - default: false, - required: true, - }, - groupPath: { - type: String, - required: true, - }, - }, + inject: ['defaultExpanded', 'groupPath'], apollo: { packageSettings: { query: getGroupPackagesSettingsQuery, @@ -50,8 +48,55 @@ export default { data() { return { packageSettings: {}, + errors: {}, }; }, + computed: { + isLoading() { + return this.$apollo.queries.packageSettings.loading; + }, + }, + methods: { + updateSettings(payload) { + this.errors = {}; + return this.$apollo + .mutate({ + mutation: updateNamespacePackageSettings, + variables: { + input: { + namespacePath: this.groupPath, + ...payload, + }, + }, + update: updateGroupPackageSettings(this.groupPath), + optimisticResponse: updateGroupPackagesSettingsOptimisticResponse({ + ...this.packageSettings, + ...payload, + }), + }) + .then(({ data }) => { + if (data.updateNamespacePackageSettings?.errors?.length > 0) { + createFlash({ message: ERROR_UPDATING_SETTINGS, type: 'warning' }); + } else { + createFlash({ message: SUCCESS_UPDATING_SETTINGS, type: 'success' }); + } + }) + .catch((e) => { + if (e.graphQLErrors) { + e.graphQLErrors.forEach((error) => { + const [ + { + path: [key], + message, + }, + ] = error.extensions.problems; + this.errors = { ...this.errors, [key]: message }; + }); + } + createFlash({ message: ERROR_UPDATING_SETTINGS, type: 'warning' }); + }); + }, + }, }; </script> @@ -70,6 +115,15 @@ export default { </gl-sprintf> </span> </template> + <template #default> + <maven-settings + :maven-duplicates-allowed="packageSettings.mavenDuplicatesAllowed" + :maven-duplicate-exception-regex="packageSettings.mavenDuplicateExceptionRegex" + :maven-duplicate-exception-regex-error="errors.mavenDuplicateExceptionRegex" + :loading="isLoading" + @update="updateSettings" + /> + </template> </settings-block> </div> </template> diff --git a/app/assets/javascripts/packages_and_registries/settings/group/components/maven_settings.vue b/app/assets/javascripts/packages_and_registries/settings/group/components/maven_settings.vue new file mode 100644 index 00000000000..aa7c6e9d8d6 --- /dev/null +++ b/app/assets/javascripts/packages_and_registries/settings/group/components/maven_settings.vue @@ -0,0 +1,113 @@ +<script> +import { GlSprintf, GlToggle, GlFormGroup, GlFormInput } from '@gitlab/ui'; + +import { + MAVEN_TITLE, + MAVEN_SETTINGS_SUBTITLE, + MAVEN_DUPLICATES_ALLOWED_DISABLED, + MAVEN_DUPLICATES_ALLOWED_ENABLED, + MAVEN_SETTING_EXCEPTION_TITLE, + MAVEN_SETTINGS_EXCEPTION_LEGEND, + MAVEN_DUPLICATES_ALLOWED, + MAVEN_DUPLICATE_EXCEPTION_REGEX, +} from '~/packages_and_registries/settings/group/constants'; + +export default { + name: 'MavenSettings', + i18n: { + MAVEN_TITLE, + MAVEN_SETTINGS_SUBTITLE, + MAVEN_SETTING_EXCEPTION_TITLE, + MAVEN_SETTINGS_EXCEPTION_LEGEND, + }, + modelNames: { + MAVEN_DUPLICATES_ALLOWED, + MAVEN_DUPLICATE_EXCEPTION_REGEX, + }, + components: { + GlSprintf, + GlToggle, + GlFormGroup, + GlFormInput, + }, + props: { + loading: { + type: Boolean, + required: false, + default: false, + }, + mavenDuplicatesAllowed: { + type: Boolean, + default: false, + required: true, + }, + mavenDuplicateExceptionRegex: { + type: String, + default: '', + required: true, + }, + mavenDuplicateExceptionRegexError: { + type: String, + default: '', + required: false, + }, + }, + computed: { + enabledButtonLabel() { + return this.mavenDuplicatesAllowed + ? MAVEN_DUPLICATES_ALLOWED_ENABLED + : MAVEN_DUPLICATES_ALLOWED_DISABLED; + }, + isMavenDuplicateExceptionRegexValid() { + return !this.mavenDuplicateExceptionRegexError; + }, + }, + methods: { + update(type, value) { + this.$emit('update', { [type]: value }); + }, + }, +}; +</script> + +<template> + <div> + <h5 class="gl-border-b-solid gl-border-b-1 gl-border-gray-200"> + {{ $options.i18n.MAVEN_TITLE }} + </h5> + <p>{{ $options.i18n.MAVEN_SETTINGS_SUBTITLE }}</p> + <form> + <div class="gl-display-flex"> + <gl-toggle + :value="mavenDuplicatesAllowed" + @change="update($options.modelNames.MAVEN_DUPLICATES_ALLOWED, $event)" + /> + <div class="gl-ml-5"> + <div data-testid="toggle-label"> + <gl-sprintf :message="enabledButtonLabel"> + <template #bold="{ content }"> + <strong>{{ content }}</strong> + </template> + </gl-sprintf> + </div> + <gl-form-group + v-if="!mavenDuplicatesAllowed" + class="gl-mt-4" + :label="$options.i18n.MAVEN_SETTING_EXCEPTION_TITLE" + label-size="sm" + :state="isMavenDuplicateExceptionRegexValid" + :invalid-feedback="mavenDuplicateExceptionRegexError" + :description="$options.i18n.MAVEN_SETTINGS_EXCEPTION_LEGEND" + label-for="maven-duplicated-settings-regex-input" + > + <gl-form-input + id="maven-duplicated-settings-regex-input" + :value="mavenDuplicateExceptionRegex" + @change="update($options.modelNames.MAVEN_DUPLICATE_EXCEPTION_REGEX, $event)" + /> + </gl-form-group> + </div> + </div> + </form> + </div> +</template> diff --git a/app/assets/javascripts/packages_and_registries/settings/group/constants.js b/app/assets/javascripts/packages_and_registries/settings/group/constants.js index b0c4bf821f9..12d595d3625 100644 --- a/app/assets/javascripts/packages_and_registries/settings/group/constants.js +++ b/app/assets/javascripts/packages_and_registries/settings/group/constants.js @@ -1,4 +1,4 @@ -import { s__ } from '~/locale'; +import { s__, __ } from '~/locale'; import { helpPagePath } from '~/helpers/help_page_helper'; export const PACKAGE_SETTINGS_HEADER = s__('PackageRegistry|Package Registry'); @@ -6,4 +6,26 @@ export const PACKAGE_SETTINGS_DESCRIPTION = s__( 'PackageRegistry|GitLab Packages allows organizations to utilize GitLab as a private repository for a variety of common package formats. %{linkStart}More Information%{linkEnd}', ); +export const MAVEN_TITLE = s__('PackageRegistry|Maven'); +export const MAVEN_SETTINGS_SUBTITLE = s__('PackageRegistry|Settings for Maven packages'); +export const MAVEN_DUPLICATES_ALLOWED_DISABLED = s__( + 'PackageRegistry|%{boldStart}Do not allow duplicates%{boldEnd} - Packages with the same name and version are rejected.', +); +export const MAVEN_DUPLICATES_ALLOWED_ENABLED = s__( + 'PackageRegistry|%{boldStart}Allow duplicates%{boldEnd} - Packages with the same name and version are accepted.', +); +export const MAVEN_SETTING_EXCEPTION_TITLE = __('Exceptions'); +export const MAVEN_SETTINGS_EXCEPTION_LEGEND = s__( + 'PackageRegistry|Packages can be published if their name or version matches this regex', +); + +export const SUCCESS_UPDATING_SETTINGS = s__('PackageRegistry|Settings saved successfully'); +export const ERROR_UPDATING_SETTINGS = s__( + 'PackageRegistry|An error occurred while saving the settings', +); + +// Parameters + export const PACKAGES_DOCS_PATH = helpPagePath('user/packages'); +export const MAVEN_DUPLICATES_ALLOWED = 'mavenDuplicatesAllowed'; +export const MAVEN_DUPLICATE_EXCEPTION_REGEX = 'mavenDuplicateExceptionRegex'; diff --git a/app/assets/javascripts/packages_and_registries/settings/group/graphql/utils/cache_update.js b/app/assets/javascripts/packages_and_registries/settings/group/graphql/utils/cache_update.js new file mode 100644 index 00000000000..06b57fe013f --- /dev/null +++ b/app/assets/javascripts/packages_and_registries/settings/group/graphql/utils/cache_update.js @@ -0,0 +1,22 @@ +import { produce } from 'immer'; +import getGroupPackagesSettingsQuery from '../queries/get_group_packages_settings.query.graphql'; + +export const updateGroupPackageSettings = (fullPath) => (client, { data: updatedData }) => { + const queryAndParams = { + query: getGroupPackagesSettingsQuery, + variables: { fullPath }, + }; + const sourceData = client.readQuery(queryAndParams); + + const data = produce(sourceData, (draftState) => { + // eslint-disable-next-line no-param-reassign + draftState.group.packageSettings = { + ...updatedData.updateNamespacePackageSettings.packageSettings, + }; + }); + + client.writeQuery({ + ...queryAndParams, + data, + }); +}; diff --git a/app/assets/javascripts/packages_and_registries/settings/group/graphql/utils/optimistic_responses.js b/app/assets/javascripts/packages_and_registries/settings/group/graphql/utils/optimistic_responses.js new file mode 100644 index 00000000000..f2c8de85bf8 --- /dev/null +++ b/app/assets/javascripts/packages_and_registries/settings/group/graphql/utils/optimistic_responses.js @@ -0,0 +1,11 @@ +export const updateGroupPackagesSettingsOptimisticResponse = (changes) => ({ + // eslint-disable-next-line @gitlab/require-i18n-strings + __typename: 'Mutation', + updateNamespacePackageSettings: { + __typename: 'UpdateNamespacePackageSettingsPayload', + errors: [], + packageSettings: { + ...changes, + }, + }, +}); diff --git a/app/assets/javascripts/pages/projects/init_form.js b/app/assets/javascripts/pages/projects/init_form.js index 9f20a3e4e46..a7124e77163 100644 --- a/app/assets/javascripts/pages/projects/init_form.js +++ b/app/assets/javascripts/pages/projects/init_form.js @@ -1,7 +1,7 @@ import ZenMode from '~/zen_mode'; import GLForm from '~/gl_form'; -export default function ($formEl) { +export default function initProjectForm($formEl) { new ZenMode(); // eslint-disable-line no-new new GLForm($formEl); // eslint-disable-line no-new } diff --git a/app/assets/javascripts/pages/projects/issues/show.js b/app/assets/javascripts/pages/projects/issues/show.js index 7068574ecb8..c613ac4de5d 100644 --- a/app/assets/javascripts/pages/projects/issues/show.js +++ b/app/assets/javascripts/pages/projects/issues/show.js @@ -16,7 +16,7 @@ import initInviteMemberModal from '~/invite_member/init_invite_member_modal'; import { IssuableType } from '~/issuable_show/constants'; -export default function () { +export default function initShowIssue() { const initialDataEl = document.getElementById('js-issuable-app'); const { issueType, ...issuableData } = parseIssuableData(initialDataEl); diff --git a/app/assets/javascripts/pages/projects/merge_requests/init_merge_request_show.js b/app/assets/javascripts/pages/projects/merge_requests/init_merge_request_show.js index 1a0c5860991..0407129fc75 100644 --- a/app/assets/javascripts/pages/projects/merge_requests/init_merge_request_show.js +++ b/app/assets/javascripts/pages/projects/merge_requests/init_merge_request_show.js @@ -10,7 +10,7 @@ import initInviteMemberTrigger from '~/invite_member/init_invite_member_trigger' import initInviteMemberModal from '~/invite_member/init_invite_member_modal'; import StatusBox from '~/merge_request/components/status_box.vue'; -export default function () { +export default function initMergeRequestShow() { new ZenMode(); // eslint-disable-line no-new initIssuableSidebar(); initPipelines(); diff --git a/app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue b/app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue index 69b02463235..97cd671e035 100644 --- a/app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue +++ b/app/assets/javascripts/pipeline_new/components/pipeline_new_form.vue @@ -9,6 +9,7 @@ import { GlFormGroup, GlFormInput, GlFormSelect, + GlFormTextarea, GlLink, GlDropdown, GlDropdownItem, @@ -38,6 +39,9 @@ export default { errorTitle: __('Pipeline cannot be run.'), warningTitle: __('The form contains the following warning:'), maxWarningsSummary: __('%{total} warnings found: showing first %{warningsDisplayed}'), + // this height value is used inline on the textarea to match the input field height + // it's used to prevent the overwrite if 'gl-h-7' or 'gl-h-7!' were used + textAreaStyle: { height: '32px' }, components: { GlAlert, GlIcon, @@ -46,6 +50,7 @@ export default { GlFormGroup, GlFormInput, GlFormSelect, + GlFormTextarea, GlLink, GlDropdown, GlDropdownItem, @@ -426,10 +431,12 @@ export default { data-testid="pipeline-form-ci-variable-key" @change="addEmptyVariable(refFullName)" /> - <gl-form-input + <gl-form-textarea v-model="variable.value" :placeholder="s__('CiVariables|Input variable value')" class="gl-mb-3" + :style="$options.textAreaStyle" + :no-resize="false" data-testid="pipeline-form-ci-variable-value" /> diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/empty_state.vue b/app/assets/javascripts/pipelines/components/pipelines_list/empty_state.vue index ee26ea2f007..8a656bb47f4 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_list/empty_state.vue +++ b/app/assets/javascripts/pipelines/components/pipelines_list/empty_state.vue @@ -1,24 +1,13 @@ <script> import { GlButton } from '@gitlab/ui'; -import { isExperimentEnabled } from '~/lib/utils/experimentation'; import { s__ } from '~/locale'; -import Tracking from '~/tracking'; export default { i18n: { - control: { - infoMessage: s__(`Pipelines|Continuous Integration can help - catch bugs by running your tests automatically, - while Continuous Deployment can help you deliver - code to your product environment.`), - buttonMessage: s__('Pipelines|Get started with Pipelines'), - }, - experiment: { - infoMessage: s__(`Pipelines|GitLab CI/CD can automatically build, + infoMessage: s__(`Pipelines|GitLab CI/CD can automatically build, test, and deploy your code. Let GitLab take care of time consuming tasks, so you can spend more time creating.`), - buttonMessage: s__('Pipelines|Get started with CI/CD'), - }, + buttonMessage: s__('Pipelines|Get started with CI/CD'), }, name: 'PipelinesEmptyState', components: { @@ -38,23 +27,6 @@ export default { required: true, }, }, - mounted() { - this.track('viewed'); - }, - methods: { - track(action) { - if (!gon.tracking_data) { - return; - } - - const { category, value, label, property } = gon.tracking_data; - - Tracking.event(category, action, { value, label, property }); - }, - isExperimentEnabled() { - return isExperimentEnabled('pipelinesEmptyState'); - }, - }, }; </script> <template> @@ -70,11 +42,7 @@ export default { {{ s__('Pipelines|Build with confidence') }} </h4> <p data-testid="info-text"> - {{ - isExperimentEnabled() - ? $options.i18n.experiment.infoMessage - : $options.i18n.control.infoMessage - }} + {{ $options.i18n.infoMessage }} </p> <div class="gl-text-center"> @@ -83,13 +51,8 @@ export default { variant="info" category="primary" data-testid="get-started-pipelines" - @click="track('documentation_clicked')" > - {{ - isExperimentEnabled() - ? $options.i18n.experiment.buttonMessage - : $options.i18n.control.buttonMessage - }} + {{ $options.i18n.buttonMessage }} </gl-button> </div> </template> diff --git a/app/assets/javascripts/pipelines/pipeline_details_bundle.js b/app/assets/javascripts/pipelines/pipeline_details_bundle.js index 5ee5b45aac9..a61d9244099 100644 --- a/app/assets/javascripts/pipelines/pipeline_details_bundle.js +++ b/app/assets/javascripts/pipelines/pipeline_details_bundle.js @@ -77,7 +77,7 @@ const createTestDetails = () => { }); }; -export default async function () { +export default async function initPipelineDetailsBundle() { createTestDetails(); createDagApp(); diff --git a/app/assets/javascripts/projects/experiment_new_project_creation/index.js b/app/assets/javascripts/projects/experiment_new_project_creation/index.js index 06920a5ab19..0414f7ef6a5 100644 --- a/app/assets/javascripts/projects/experiment_new_project_creation/index.js +++ b/app/assets/javascripts/projects/experiment_new_project_creation/index.js @@ -1,7 +1,7 @@ import Vue from 'vue'; import NewProjectCreationApp from './components/app.vue'; -export default function (el, props) { +export default function initNewProjectCreation(el, props) { return new Vue({ el, components: { diff --git a/app/assets/javascripts/related_issues/components/related_issues_list.vue b/app/assets/javascripts/related_issues/components/related_issues_list.vue index 8021d390d95..825a4a02b71 100644 --- a/app/assets/javascripts/related_issues/components/related_issues_list.vue +++ b/app/assets/javascripts/related_issues/components/related_issues_list.vue @@ -60,8 +60,8 @@ export default { const nextItemEl = itemEl.nextElementSibling; return { - beforeId: prevItemEl && parseInt(prevItemEl.dataset.orderingId, 0), - afterId: nextItemEl && parseInt(nextItemEl.dataset.orderingId, 0), + beforeId: prevItemEl && parseInt(prevItemEl.dataset.orderingId, 10), + afterId: nextItemEl && parseInt(nextItemEl.dataset.orderingId, 10), }; }, reordered(event) { diff --git a/app/assets/javascripts/vue_shared/directives/validation.js b/app/assets/javascripts/vue_shared/directives/validation.js index ece09df272c..176954891e9 100644 --- a/app/assets/javascripts/vue_shared/directives/validation.js +++ b/app/assets/javascripts/vue_shared/directives/validation.js @@ -86,7 +86,7 @@ const createValidator = (context, feedbackMap) => ({ el, reportInvalidInput = fa * @param {Object<string, { message: string, isValid: ?function}>} customFeedbackMap * @returns {{ inserted: function, update: function }} validateDirective */ -export default function (customFeedbackMap = {}) { +export default function initValidation(customFeedbackMap = {}) { const feedbackMap = merge(defaultFeedbackMap, customFeedbackMap); const elDataMap = new WeakMap(); diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index e5528c25e82..9d6ae83c451 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -156,14 +156,6 @@ color: inherit; } - // TODO remove this class once we can generate a correct hover utility from `gitlab/ui`, - // see here: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/39286#note_396767000 - .btn-link-hover:hover { - * { - @include gl-text-blue-800; - } - } - .issuable-header-text { margin-top: 7px; } diff --git a/app/controllers/projects/merge_requests/creations_controller.rb b/app/controllers/projects/merge_requests/creations_controller.rb index 858bdc066c1..947a4a680f8 100644 --- a/app/controllers/projects/merge_requests/creations_controller.rb +++ b/app/controllers/projects/merge_requests/creations_controller.rb @@ -12,7 +12,6 @@ class Projects::MergeRequests::CreationsController < Projects::MergeRequests::Ap before_action :build_merge_request, except: [:create] before_action do - push_frontend_feature_flag(:merge_request_reviewers, @project, default_enabled: true) push_frontend_feature_flag(:mr_collapsed_approval_rules, @project) push_frontend_feature_flag(:reviewer_approval_rules, @project, default_enabled: :yaml) end diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index b8467670e4b..ea9c504c3b5 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -52,7 +52,6 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo end before_action do - push_frontend_feature_flag(:merge_request_reviewers, @project, default_enabled: true) push_frontend_feature_flag(:mr_collapsed_approval_rules, @project) push_frontend_feature_flag(:reviewer_approval_rules, @project, default_enabled: :yaml) end diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb index 4b5ce02676c..74936abe59c 100644 --- a/app/controllers/projects/pipelines_controller.rb +++ b/app/controllers/projects/pipelines_controller.rb @@ -20,7 +20,6 @@ class Projects::PipelinesController < Projects::ApplicationController push_frontend_feature_flag(:jira_for_vulnerabilities, project, type: :development, default_enabled: :yaml) end before_action :ensure_pipeline, only: [:show] - before_action :push_experiment_to_gon, only: :index, if: :html_request? # Will be removed with https://gitlab.com/gitlab-org/gitlab/-/issues/225596 before_action :redirect_for_legacy_scope_filter, only: [:index], if: -> { request.format.html? } @@ -45,11 +44,7 @@ class Projects::PipelinesController < Projects::ApplicationController @pipelines_count = limited_pipelines_count(project) respond_to do |format| - format.html do - record_empty_pipeline_experiment - - render :index - end + format.html format.json do Gitlab::PollingInterval.set_header(response, interval: POLLING_INTERVAL) @@ -300,20 +295,6 @@ class Projects::PipelinesController < Projects::ApplicationController def index_params params.permit(:scope, :username, :ref, :status) end - - def record_empty_pipeline_experiment - return unless @pipelines_count.to_i == 0 - return if helpers.has_gitlab_ci?(@project) - - record_experiment_user(:pipelines_empty_state) - end - - def push_experiment_to_gon - return unless current_user - - push_frontend_experiment(:pipelines_empty_state, subject: current_user) - frontend_experimentation_tracking_data(:pipelines_empty_state, 'view', project.namespace_id, subject: current_user) - end end Projects::PipelinesController.prepend_if_ee('EE::Projects::PipelinesController') diff --git a/app/graphql/resolvers/project_merge_requests_resolver.rb b/app/graphql/resolvers/project_merge_requests_resolver.rb index 21d9afc31ab..934f07f7d9f 100644 --- a/app/graphql/resolvers/project_merge_requests_resolver.rb +++ b/app/graphql/resolvers/project_merge_requests_resolver.rb @@ -22,7 +22,7 @@ module Resolvers def only_count_is_selected_with_merged_at_filter?(args) return unless lookahead - argument_names = args.except(:lookahead, :sort, :merged_before, :merged_after).keys + argument_names = args.compact.except(:lookahead, :sort, :merged_before, :merged_after).keys # no extra filtering arguments are provided return unless argument_names.empty? @@ -34,7 +34,7 @@ module Resolvers # totalTimeToMerge # } allowed_selected_fields = [:count, :total_time_to_merge] - selected_fields = lookahead.selections.map(&:field).map(&:original_name) + selected_fields = lookahead.selections.map(&:field).map(&:original_name) - [:__typename] # ignore __typename meta field # only the allowed_selected_fields are present (selected_fields - allowed_selected_fields).empty? diff --git a/app/graphql/types/merge_request_type.rb b/app/graphql/types/merge_request_type.rb index 62b3e174a9f..c3415707378 100644 --- a/app/graphql/types/merge_request_type.rb +++ b/app/graphql/types/merge_request_type.rb @@ -243,7 +243,7 @@ module Types end def reviewers - object.reviewers if object.allows_reviewers? + object.reviewers end end end diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index 6ab5f499b9a..ff1305f8cc5 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -174,15 +174,9 @@ module MergeRequestsHelper end end - def merge_request_reviewers_enabled? - Feature.enabled?(:merge_request_reviewers, default_enabled: :yaml) - end - private def review_requested_merge_requests_count - return 0 unless merge_request_reviewers_enabled? - current_user.review_requested_open_merge_requests_count end diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index c6a3fe24186..54d7e92f782 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -996,7 +996,7 @@ module Ci end def has_coverage_reports? - pipeline_artifacts&.has_report?(:code_coverage) + pipeline_artifacts&.report_exists?(:code_coverage) end def can_generate_coverage_reports? @@ -1004,7 +1004,7 @@ module Ci end def has_codequality_mr_diff_report? - pipeline_artifacts&.has_report?(:code_quality_mr_diff) + pipeline_artifacts&.report_exists?(:code_quality_mr_diff) end def can_generate_codequality_reports? diff --git a/app/models/ci/pipeline_artifact.rb b/app/models/ci/pipeline_artifact.rb index 46a60914342..f538a4cd808 100644 --- a/app/models/ci/pipeline_artifact.rb +++ b/app/models/ci/pipeline_artifact.rb @@ -18,6 +18,11 @@ module Ci code_quality_mr_diff: 'code_quality_mr_diff.json' }.freeze + REPORT_TYPES = { + code_coverage: :raw, + code_quality_mr_diff: :raw + }.freeze + belongs_to :project, class_name: "Project", inverse_of: :pipeline_artifacts belongs_to :pipeline, class_name: "Ci::Pipeline", inverse_of: :pipeline_artifacts @@ -36,7 +41,9 @@ module Ci } class << self - def has_report?(file_type) + def report_exists?(file_type) + return false unless REPORT_TYPES.key?(file_type) + where(file_type: file_type).exists? end diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 73418270a34..e41781dce4f 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -1784,7 +1784,7 @@ class MergeRequest < ApplicationRecord end def allows_reviewers? - Feature.enabled?(:merge_request_reviewers, project, default_enabled: true) + true end def allows_multiple_reviewers? diff --git a/app/models/project_services/jira_service.rb b/app/models/project_services/jira_service.rb index dafd3d095ec..61e9773d49a 100644 --- a/app/models/project_services/jira_service.rb +++ b/app/models/project_services/jira_service.rb @@ -30,7 +30,8 @@ class JiraService < IssueTrackerService # TODO: we can probably just delegate as part of # https://gitlab.com/gitlab-org/gitlab/issues/29404 - data_field :username, :password, :url, :api_url, :jira_issue_transition_id, :project_key, :issues_enabled, :vulnerabilities_enabled, :vulnerabilities_issuetype + data_field :username, :password, :url, :api_url, :jira_issue_transition_id, :project_key, :issues_enabled, + :vulnerabilities_enabled, :vulnerabilities_issuetype, :proxy_address, :proxy_port, :proxy_username, :proxy_password before_update :reset_password after_commit :update_deployment_type, on: [:create, :update], if: :update_deployment_type? diff --git a/app/models/project_services/jira_tracker_data.rb b/app/models/project_services/jira_tracker_data.rb index 00b6ab6a70f..6cbcb1550c1 100644 --- a/app/models/project_services/jira_tracker_data.rb +++ b/app/models/project_services/jira_tracker_data.rb @@ -7,6 +7,15 @@ class JiraTrackerData < ApplicationRecord attr_encrypted :api_url, encryption_options attr_encrypted :username, encryption_options attr_encrypted :password, encryption_options + attr_encrypted :proxy_address, encryption_options + attr_encrypted :proxy_port, encryption_options + attr_encrypted :proxy_username, encryption_options + attr_encrypted :proxy_password, encryption_options + + validates :proxy_address, length: { maximum: 2048 } + validates :proxy_port, length: { maximum: 5 } + validates :proxy_username, length: { maximum: 255 } + validates :proxy_password, length: { maximum: 255 } enum deployment_type: { unknown: 0, server: 1, cloud: 2 }, _prefix: :deployment end diff --git a/app/serializers/merge_request_basic_entity.rb b/app/serializers/merge_request_basic_entity.rb index 9e2bce53c8a..7d45484fc2f 100644 --- a/app/serializers/merge_request_basic_entity.rb +++ b/app/serializers/merge_request_basic_entity.rb @@ -10,7 +10,7 @@ class MergeRequestBasicEntity < Grape::Entity expose :milestone, using: API::Entities::Milestone expose :labels, using: LabelEntity expose :assignees, using: API::Entities::UserBasic - expose :reviewers, if: -> (m) { m.allows_reviewers? }, using: API::Entities::UserBasic + expose :reviewers, using: API::Entities::UserBasic expose :task_status, :task_status_short expose :lock_version, :lock_version end diff --git a/app/serializers/merge_request_sidebar_extras_entity.rb b/app/serializers/merge_request_sidebar_extras_entity.rb index b1638ce71e2..1a0111fe5d0 100644 --- a/app/serializers/merge_request_sidebar_extras_entity.rb +++ b/app/serializers/merge_request_sidebar_extras_entity.rb @@ -5,7 +5,7 @@ class MergeRequestSidebarExtrasEntity < IssuableSidebarExtrasEntity MergeRequestUserEntity.represent(merge_request.assignees, options.merge(merge_request: merge_request)) end - expose :reviewers, if: -> (m) { m.allows_reviewers? } do |merge_request, options| + expose :reviewers do |merge_request, options| MergeRequestUserEntity.represent(merge_request.reviewers, options.merge(merge_request: merge_request)) end end diff --git a/app/services/ci/create_pipeline_service.rb b/app/services/ci/create_pipeline_service.rb index d3001e54288..dc42411dfa1 100644 --- a/app/services/ci/create_pipeline_service.rb +++ b/app/services/ci/create_pipeline_service.rb @@ -123,7 +123,6 @@ module Ci def record_conversion_event Experiments::RecordConversionEventWorker.perform_async(:ci_syntax_templates, current_user.id) - Experiments::RecordConversionEventWorker.perform_async(:pipelines_empty_state, current_user.id) end def create_namespace_onboarding_action diff --git a/app/services/ci/pipeline_artifacts/coverage_report_service.rb b/app/services/ci/pipeline_artifacts/coverage_report_service.rb index 9f5c445c91a..8209639fa22 100644 --- a/app/services/ci/pipeline_artifacts/coverage_report_service.rb +++ b/app/services/ci/pipeline_artifacts/coverage_report_service.rb @@ -11,7 +11,7 @@ module Ci pipeline.pipeline_artifacts.create!( project_id: pipeline.project_id, file_type: :code_coverage, - file_format: :raw, + file_format: Ci::PipelineArtifact::REPORT_TYPES.fetch(:code_coverage), size: file["tempfile"].size, file: file, expire_at: Ci::PipelineArtifact::EXPIRATION_DATE.from_now diff --git a/app/services/ci/pipeline_artifacts/create_code_quality_mr_diff_report_service.rb b/app/services/ci/pipeline_artifacts/create_code_quality_mr_diff_report_service.rb index 8a4ba039fa3..5c52eef7ba6 100644 --- a/app/services/ci/pipeline_artifacts/create_code_quality_mr_diff_report_service.rb +++ b/app/services/ci/pipeline_artifacts/create_code_quality_mr_diff_report_service.rb @@ -11,7 +11,7 @@ module Ci pipeline.pipeline_artifacts.create!( project_id: pipeline.project_id, file_type: :code_quality_mr_diff, - file_format: :raw, + file_format: Ci::PipelineArtifact::REPORT_TYPES.fetch(:code_quality_mr_diff), size: file["tempfile"].size, file: file, expire_at: Ci::PipelineArtifact::EXPIRATION_DATE.from_now diff --git a/app/services/design_management/save_designs_service.rb b/app/services/design_management/save_designs_service.rb index c26d2e7ab47..da653e2524a 100644 --- a/app/services/design_management/save_designs_service.rb +++ b/app/services/design_management/save_designs_service.rb @@ -18,6 +18,7 @@ module DesignManagement return error("Only #{MAX_FILES} files are allowed simultaneously") if files.size > MAX_FILES return error("Duplicate filenames are not allowed!") if files.map(&:original_filename).uniq.length != files.length return error("Design copy is in progress") if design_collection.copy_in_progress? + return error("Filenames contained invalid characters and could not be saved") if files.any?(&:filename_sanitized?) uploaded_designs, version = upload_designs! skipped_designs = designs - uploaded_designs diff --git a/app/services/merge_requests/base_service.rb b/app/services/merge_requests/base_service.rb index 0613c061f2e..6bd31e26748 100644 --- a/app/services/merge_requests/base_service.rb +++ b/app/services/merge_requests/base_service.rb @@ -108,7 +108,7 @@ module MergeRequests def filter_reviewer(merge_request) return if params[:reviewer_ids].blank? - unless can_admin_issuable?(merge_request) && merge_request.allows_reviewers? + unless can_admin_issuable?(merge_request) params.delete(:reviewer_ids) return diff --git a/app/views/admin/application_settings/_account_and_limit.html.haml b/app/views/admin/application_settings/_account_and_limit.html.haml index aa57a2e2e85..009e0732911 100644 --- a/app/views/admin/application_settings/_account_and_limit.html.haml +++ b/app/views/admin/application_settings/_account_and_limit.html.haml @@ -29,6 +29,7 @@ = f.number_field :session_expire_delay, class: 'form-control gl-form-input', title: _('Maximum duration of a session.'), data: { toggle: 'tooltip', container: 'body' } %span.form-text.text-muted#session_expire_delay_help_block= _('GitLab restart is required to apply changes.') + = render_if_exists 'admin/application_settings/git_two_factor_session_expiry', form: f = render_if_exists 'admin/application_settings/personal_access_token_expiration_policy', form: f = render_if_exists 'admin/application_settings/enforce_pat_expiration', form: f = render_if_exists 'admin/application_settings/enforce_ssh_key_expiration', form: f diff --git a/app/views/groups/settings/repository/show.html.haml b/app/views/groups/settings/repository/show.html.haml index 869d36d56c5..a5819320405 100644 --- a/app/views/groups/settings/repository/show.html.haml +++ b/app/views/groups/settings/repository/show.html.haml @@ -1,7 +1,7 @@ - breadcrumb_title _('Repository Settings') - page_title _('Repository') -- deploy_token_description = s_('DeployTokens|Group Deploy Tokens allow access to the packages, repositories, and registry images within the group.') +- deploy_token_description = s_('DeployTokens|Group deploy tokens allow access to the packages, repositories, and registry images within the group.') = render "shared/deploy_tokens/index", group_or_project: @group, description: deploy_token_description = render "initial_branch_name", group: @group diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index 1834e93a079..c54ad23c094 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -47,11 +47,10 @@ %span.badge.badge-pill.issues-count.green-badge{ class: ('hidden' if issues_count == 0) } = number_with_delimiter(issues_count) - if header_link?(:merge_requests) - - reviewers_enabled = merge_request_reviewers_enabled? - = nav_link(path: 'dashboard#merge_requests', html_options: { class: "user-counter #{reviewers_enabled ? 'dropdown' : ''}" }) do + = nav_link(path: 'dashboard#merge_requests', html_options: { class: "user-counter dropdown" }) do = link_to assigned_mrs_dashboard_path, class: 'dashboard-shortcuts-merge_requests', title: _('Merge requests'), aria: { label: _('Merge requests') }, data: { qa_selector: 'merge_requests_shortcut_button', - toggle: reviewers_enabled ? "dropdown" : "tooltip", + toggle: "dropdown", placement: 'bottom', track_label: 'main_navigation', track_event: 'click_merge_link', @@ -60,23 +59,21 @@ = sprite_icon('git-merge') %span.badge.badge-pill.merge-requests-count.js-merge-requests-count{ class: ('hidden' if user_merge_requests_counts[:total] == 0) } = number_with_delimiter(user_merge_requests_counts[:total]) - - if reviewers_enabled - = sprite_icon('chevron-down', css_class: 'caret-down gl-mx-0!') - - if reviewers_enabled - .dropdown-menu.dropdown-menu-right - %ul - %li.dropdown-header - = _('Merge requests') - %li - = link_to assigned_mrs_dashboard_path, class: 'gl-display-flex! gl-align-items-center' do - = _('Assigned to you') - %span.badge.gl-badge.badge-pill.badge-muted.merge-request-badge.gl-ml-auto.js-assigned-mr-count{ class: "" } - = user_merge_requests_counts[:assigned] - %li - = link_to reviewer_mrs_dashboard_path, class: 'gl-display-flex! gl-align-items-center' do - = _('Review requests for you') - %span.badge.gl-badge.badge-pill.badge-muted.merge-request-badge.gl-ml-auto.js-reviewer-mr-count{ class: "" } - = user_merge_requests_counts[:review_requested] + = sprite_icon('chevron-down', css_class: 'caret-down gl-mx-0!') + .dropdown-menu.dropdown-menu-right + %ul + %li.dropdown-header + = _('Merge requests') + %li + = link_to assigned_mrs_dashboard_path, class: 'gl-display-flex! gl-align-items-center' do + = _('Assigned to you') + %span.badge.gl-badge.badge-pill.badge-muted.merge-request-badge.gl-ml-auto.js-assigned-mr-count{ class: "" } + = user_merge_requests_counts[:assigned] + %li + = link_to reviewer_mrs_dashboard_path, class: 'gl-display-flex! gl-align-items-center' do + = _('Review requests for you') + %span.badge.gl-badge.badge-pill.badge-muted.merge-request-badge.gl-ml-auto.js-reviewer-mr-count{ class: "" } + = user_merge_requests_counts[:review_requested] - if header_link?(:todos) = nav_link(controller: 'dashboard/todos', html_options: { class: "user-counter" }) do = link_to dashboard_todos_path, title: _('To-Do List'), aria: { label: _('To-Do List') }, class: 'shortcuts-todos', diff --git a/app/views/profiles/personal_access_tokens/index.html.haml b/app/views/profiles/personal_access_tokens/index.html.haml index fdc760e671e..ee04d9142b1 100644 --- a/app/views/profiles/personal_access_tokens/index.html.haml +++ b/app/views/profiles/personal_access_tokens/index.html.haml @@ -45,7 +45,7 @@ = s_('AccessTokens|It cannot be used to access any other data.') .col-lg-8.feed-token-reset = label_tag :feed_token, s_('AccessTokens|Feed token'), class: 'label-bold' - = text_field_tag :feed_token, current_user.feed_token, class: 'form-control js-select-on-focus', readonly: true + = text_field_tag :feed_token, current_user.feed_token, class: 'form-control gl-form-input js-select-on-focus', readonly: true %p.form-text.text-muted - reset_link = link_to s_('AccessTokens|reset it'), [:reset, :feed_token, :profile], method: :put, data: { confirm: s_('AccessTokens|Are you sure? Any RSS or calendar URLs currently in use will stop working.') } - reset_message = s_('AccessTokens|Keep this token secret. Anyone who gets ahold of it can read activity and issue RSS feeds or your calendar feed as if they were you. You should %{link_reset_it} if that ever happens.') % { link_reset_it: reset_link } @@ -64,7 +64,7 @@ = s_('AccessTokens|It cannot be used to access any other data.') .col-lg-8.incoming-email-token-reset = label_tag :incoming_email_token, s_('AccessTokens|Incoming email token'), class: 'label-bold' - = text_field_tag :incoming_email_token, current_user.incoming_email_token, class: 'form-control js-select-on-focus', readonly: true + = text_field_tag :incoming_email_token, current_user.incoming_email_token, class: 'form-control gl-form-input js-select-on-focus', readonly: true %p.form-text.text-muted - reset_link = link_to s_('AccessTokens|reset it'), [:reset, :incoming_email_token, :profile], method: :put, data: { confirm: s_('AccessTokens|Are you sure? Any issue email addresses currently in use will stop working.') } - reset_message = s_('AccessTokens|Keep this token secret. Anyone who gets ahold of it can create issues as if they were you. You should %{link_reset_it} if that ever happens.') % { link_reset_it: reset_link } @@ -83,7 +83,7 @@ = s_('AccessTokens|It cannot be used to access any other data.') .col-lg-8 = label_tag :static_object_token, s_('AccessTokens|Static object token'), class: "label-bold" - = text_field_tag :static_object_token, current_user.static_object_token, class: 'form-control', readonly: true, onclick: 'this.select()' + = text_field_tag :static_object_token, current_user.static_object_token, class: 'form-control gl-form-input', readonly: true, onclick: 'this.select()' %p.form-text.text-muted - reset_link = url_for [:reset, :static_object_token, :profile] - reset_link_start = '<a data-confirm="%{confirm}" rel="nofollow" data-method="put" href="%{url}">'.html_safe % { confirm: s_('AccessTokens|Are you sure?'), url: reset_link } diff --git a/app/views/projects/default_branch/_show.html.haml b/app/views/projects/default_branch/_show.html.haml index 4e504f4c319..0c7649e93d7 100644 --- a/app/views/projects/default_branch/_show.html.haml +++ b/app/views/projects/default_branch/_show.html.haml @@ -2,7 +2,7 @@ %section.settings.no-animate#default-branch-settings{ class: ('expanded' if expanded) } .settings-header - %h4= _('Default Branch') + %h4= _('Default branch') %button.btn.js-settings-toggle = expanded ? _('Collapse') : _('Expand') %p @@ -16,7 +16,7 @@ = _('A default branch cannot be chosen for an empty project.') - else .form-group - = f.label :default_branch, "Default Branch", class: 'label-bold' + = f.label :default_branch, "Default branch", class: 'label-bold' = f.select(:default_branch, @project.repository.branch_names, {}, {class: 'select2 select-wide'}) .form-group diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index 4711143c900..b1463693fb4 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -55,7 +55,7 @@ - if merge_request.assignees.any? %li.gl-display-flex.gl-align-items-center = render 'shared/issuable/assignees', project: merge_request.project, issuable: merge_request - - if Feature.enabled?(:merge_request_reviewers, @project, default_enabled: true) && merge_request.reviewers.any? + - if merge_request.reviewers.any? %li.gl-display-flex.issuable-reviewers = render 'shared/issuable/reviewers', project: merge_request.project, issuable: merge_request = render 'projects/merge_requests/approvals_count', merge_request: merge_request diff --git a/app/views/projects/protected_branches/shared/_index.html.haml b/app/views/projects/protected_branches/shared/_index.html.haml index 66173c4759b..1d3e3fb11ae 100644 --- a/app/views/projects/protected_branches/shared/_index.html.haml +++ b/app/views/projects/protected_branches/shared/_index.html.haml @@ -3,7 +3,7 @@ %section.settings.no-animate#js-protected-branches-settings{ class: ('expanded' if expanded), data: { qa_selector: 'protected_branches_settings_content' } } .settings-header %h4 - Protected Branches + Protected branches %button.btn.js-settings-toggle.qa-expand-protected-branches{ type: 'button' } = expanded ? 'Collapse' : 'Expand' %p diff --git a/app/views/projects/protected_tags/shared/_index.html.haml b/app/views/projects/protected_tags/shared/_index.html.haml index 5734b7dc3c9..67eadd39ed6 100644 --- a/app/views/projects/protected_tags/shared/_index.html.haml +++ b/app/views/projects/protected_tags/shared/_index.html.haml @@ -3,7 +3,7 @@ %section.settings.no-animate#js-protected-tags-settings{ class: ('expanded' if expanded), data: { qa_selector: 'protected_tag_settings_content' } } .settings-header %h4 - Protected Tags + Protected tags %button.btn.js-settings-toggle{ type: 'button' } = expanded ? 'Collapse' : 'Expand' %p diff --git a/app/views/projects/settings/repository/show.html.haml b/app/views/projects/settings/repository/show.html.haml index 8ac22e1c325..24fc137fd29 100644 --- a/app/views/projects/settings/repository/show.html.haml +++ b/app/views/projects/settings/repository/show.html.haml @@ -1,7 +1,7 @@ - breadcrumb_title _("Repository Settings") - page_title _("Repository") - @content_class = "limit-container-width" unless fluid_layout -- deploy_token_description = s_('DeployTokens|Deploy Tokens allow access to packages, your repository, and registry images.') +- deploy_token_description = s_('DeployTokens|Deploy tokens allow access to packages, your repository, and registry images.') = render "projects/default_branch/show" = render_if_exists "projects/push_rules/index" diff --git a/app/views/shared/deploy_keys/_index.html.haml b/app/views/shared/deploy_keys/_index.html.haml index af4a35264e9..5d9c2cd25b4 100644 --- a/app/views/shared/deploy_keys/_index.html.haml +++ b/app/views/shared/deploy_keys/_index.html.haml @@ -1,12 +1,12 @@ - expanded = expanded_by_default? %section.qa-deploy-keys-settings.settings.no-animate#js-deploy-keys-settings{ class: ('expanded' if expanded), data: { qa_selector: 'deploy_keys_settings_content' } } .settings-header - %h4= _('Deploy Keys') + %h4= _('Deploy keys') %button.btn.js-settings-toggle{ type: 'button' } = expanded ? 'Collapse' : 'Expand' %p - link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('user/project/deploy_keys/index') } - = _("Add deploy keys to grant read/write access to this repository. %{link_start}What are Deploy Keys?%{link_end}").html_safe % { link_start: link_start, link_end: '</a>'.html_safe } + = _("Add deploy keys to grant read/write access to this repository. %{link_start}What are deploy keys?%{link_end}").html_safe % { link_start: link_start, link_end: '</a>'.html_safe } .settings-content %h5.gl-mt-0 = render @deploy_keys.form_partial_path diff --git a/app/views/shared/deploy_tokens/_index.html.haml b/app/views/shared/deploy_tokens/_index.html.haml index 0c0074cf4a6..e64b8634cf5 100644 --- a/app/views/shared/deploy_tokens/_index.html.haml +++ b/app/views/shared/deploy_tokens/_index.html.haml @@ -2,7 +2,7 @@ %section.qa-deploy-tokens-settings.settings.no-animate#js-deploy-tokens{ class: ('expanded' if expanded), data: { qa_selector: 'deploy_tokens_settings_content' } } .settings-header - %h4= s_('DeployTokens|Deploy Tokens') + %h4= s_('DeployTokens|Deploy tokens') %button.gl-button.btn.js-settings-toggle.qa-expand-deploy-keys{ type: 'button' } = expanded ? 'Collapse' : 'Expand' %p @@ -11,7 +11,7 @@ - if @new_deploy_token.persisted? = render 'shared/deploy_tokens/new_deploy_token', deploy_token: @new_deploy_token %h5.gl-mt-0 - = s_('DeployTokens|Add a Deploy Token') + = s_('DeployTokens|Add a deploy token') = render 'shared/deploy_tokens/form', group_or_project: group_or_project, token: @new_deploy_token, presenter: @deploy_tokens %hr = render 'shared/deploy_tokens/table', group_or_project: group_or_project, active_tokens: @deploy_tokens diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml index a1150fbfe1b..c22025462ce 100644 --- a/app/views/shared/issuable/_sidebar.html.haml +++ b/app/views/shared/issuable/_sidebar.html.haml @@ -26,7 +26,7 @@ .block.assignee.qa-assignee-block = render "shared/issuable/sidebar_assignees", issuable_sidebar: issuable_sidebar, assignees: assignees, signed_in: signed_in - - if Feature.enabled?(:merge_request_reviewers, @project, default_enabled: true) && reviewers + - if reviewers .block.reviewer.qa-reviewer-block = render "shared/issuable/sidebar_reviewers", issuable_sidebar: issuable_sidebar, reviewers: reviewers, signed_in: signed_in diff --git a/changelogs/unreleased/216912-jira-proxy-settings.yml b/changelogs/unreleased/216912-jira-proxy-settings.yml new file mode 100644 index 00000000000..141e756b511 --- /dev/null +++ b/changelogs/unreleased/216912-jira-proxy-settings.yml @@ -0,0 +1,5 @@ +--- +title: Add Jira proxy settings columns +merge_request: 52119 +author: +type: added diff --git a/changelogs/unreleased/gl-form-input-user-pat.yml b/changelogs/unreleased/gl-form-input-user-pat.yml new file mode 100644 index 00000000000..569141cc554 --- /dev/null +++ b/changelogs/unreleased/gl-form-input-user-pat.yml @@ -0,0 +1,5 @@ +--- +title: Apply new GitLab UI for input field in user personal access token settings +merge_request: 52426 +author: Yogi (@yo) +type: other diff --git a/changelogs/unreleased/khanchi-designs-patch2.yml b/changelogs/unreleased/khanchi-designs-patch2.yml new file mode 100644 index 00000000000..1baee07be88 --- /dev/null +++ b/changelogs/unreleased/khanchi-designs-patch2.yml @@ -0,0 +1,5 @@ +--- +title: 'Designs: return error if uploading filenames with special chars' +merge_request: 44136 +author: Sushil Khanchi @khanchi97 +type: fixed diff --git a/changelogs/unreleased/nicolasdular-cleanup-pipelines-empty-state-experiment.yml b/changelogs/unreleased/nicolasdular-cleanup-pipelines-empty-state-experiment.yml new file mode 100644 index 00000000000..1691991e5c9 --- /dev/null +++ b/changelogs/unreleased/nicolasdular-cleanup-pipelines-empty-state-experiment.yml @@ -0,0 +1,5 @@ +--- +title: Change pipeline empty state language +merge_request: 53281 +author: +type: changed diff --git a/changelogs/unreleased/pb-move-pipeline-new-input-to-textarea.yml b/changelogs/unreleased/pb-move-pipeline-new-input-to-textarea.yml new file mode 100644 index 00000000000..e7e4b50202e --- /dev/null +++ b/changelogs/unreleased/pb-move-pipeline-new-input-to-textarea.yml @@ -0,0 +1,6 @@ +--- +title: Support multi-line string variable values when running a manual pipeline in + the UI. +merge_request: 53292 +author: +type: fixed diff --git a/changelogs/unreleased/remove-merge-request-reviewer-ff.yml b/changelogs/unreleased/remove-merge-request-reviewer-ff.yml new file mode 100644 index 00000000000..ee102e05557 --- /dev/null +++ b/changelogs/unreleased/remove-merge-request-reviewer-ff.yml @@ -0,0 +1,5 @@ +--- +title: Remove merge_request_reviewers feature flag +merge_request: 52468 +author: +type: removed diff --git a/changelogs/unreleased/sselhorn-sentence-case-ui.yml b/changelogs/unreleased/sselhorn-sentence-case-ui.yml new file mode 100644 index 00000000000..066ac6a77c4 --- /dev/null +++ b/changelogs/unreleased/sselhorn-sentence-case-ui.yml @@ -0,0 +1,5 @@ +--- +title: Updated UI text to be sentence case +merge_request: 53323 +author: +type: other diff --git a/config/feature_flags/development/merge_request_reviewers.yml b/config/feature_flags/development/merge_request_reviewers.yml deleted file mode 100644 index 85582ee25f9..00000000000 --- a/config/feature_flags/development/merge_request_reviewers.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: merge_request_reviewers -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40488 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/245190 -milestone: '13.4' -type: development -group: group::code review -default_enabled: true diff --git a/config/feature_flags/experiment/pipelines_empty_state_experiment_percentage.yml b/config/feature_flags/experiment/pipelines_empty_state_experiment_percentage.yml deleted file mode 100644 index beb8e8a21c6..00000000000 --- a/config/feature_flags/experiment/pipelines_empty_state_experiment_percentage.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: pipelines_empty_state_experiment_percentage -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47952 -rollout_issue_url: https://gitlab.com/gitlab-org/growth/team-tasks/-/issues/289 -milestone: '13.8' -type: experiment -group: group::activation -default_enabled: false diff --git a/db/migrate/20210119153801_add_proxy_settings_to_jira_tracker_data.rb b/db/migrate/20210119153801_add_proxy_settings_to_jira_tracker_data.rb new file mode 100644 index 00000000000..237ea25554d --- /dev/null +++ b/db/migrate/20210119153801_add_proxy_settings_to_jira_tracker_data.rb @@ -0,0 +1,16 @@ +# frozen_string_literal: true + +class AddProxySettingsToJiraTrackerData < ActiveRecord::Migration[6.0] + DOWNTIME = false + + def change + add_column :jira_tracker_data, :encrypted_proxy_address, :text + add_column :jira_tracker_data, :encrypted_proxy_address_iv, :text + add_column :jira_tracker_data, :encrypted_proxy_port, :text + add_column :jira_tracker_data, :encrypted_proxy_port_iv, :text + add_column :jira_tracker_data, :encrypted_proxy_username, :text + add_column :jira_tracker_data, :encrypted_proxy_username_iv, :text + add_column :jira_tracker_data, :encrypted_proxy_password, :text + add_column :jira_tracker_data, :encrypted_proxy_password_iv, :text + end +end diff --git a/db/schema_migrations/20210119153801 b/db/schema_migrations/20210119153801 new file mode 100644 index 00000000000..f84f7ad1d48 --- /dev/null +++ b/db/schema_migrations/20210119153801 @@ -0,0 +1 @@ +c8b5485f158fdec0ab6813e4014713786dfa231b901e77ea610a873d03f8f0f0
\ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index 16abc737975..e9628af9a0d 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -13602,6 +13602,14 @@ CREATE TABLE jira_tracker_data ( deployment_type smallint DEFAULT 0 NOT NULL, vulnerabilities_issuetype text, vulnerabilities_enabled boolean DEFAULT false NOT NULL, + encrypted_proxy_address text, + encrypted_proxy_address_iv text, + encrypted_proxy_port text, + encrypted_proxy_port_iv text, + encrypted_proxy_username text, + encrypted_proxy_username_iv text, + encrypted_proxy_password text, + encrypted_proxy_password_iv text, CONSTRAINT check_0bf84b76e9 CHECK ((char_length(vulnerabilities_issuetype) <= 255)), CONSTRAINT check_214cf6a48b CHECK ((char_length(project_key) <= 255)) ); diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md index 097a9e5937f..63a705201dd 100644 --- a/doc/api/merge_requests.md +++ b/doc/api/merge_requests.md @@ -454,10 +454,10 @@ Parameters: | `author_id` | integer | no | Returns merge requests created by the given user `id`. Mutually exclusive with `author_username`. _([Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/13060) in GitLab 9.5)_. | | `author_username` | string | no | Returns merge requests created by the given `username`. Mutually exclusive with `author_id`. _([Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/13060) in GitLab 12.10)_. | | `assignee_id` | integer | no | Returns merge requests assigned to the given user `id`. `None` returns unassigned merge requests. `Any` returns merge requests with an assignee. _([Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/13060) in GitLab 9.5)_. | -| `approver_ids` **(PREMIUM)** | integer array | no | Returns merge requests which have specified all the users with the given `id`s as individual approvers. `None` returns merge requests without approvers. `Any` returns merge requests with an approver. | +| `approver_ids` **(PREMIUM))** | integer array | no | Returns merge requests which have specified all the users with the given `id`s as individual approvers. `None` returns merge requests without approvers. `Any` returns merge requests with an approver. | | `approved_by_ids` **(PREMIUM)** | integer array | no | Returns merge requests which have been approved by all the users with the given `id`s (Max: 5). `None` returns merge requests with no approvals. `Any` returns merge requests with an approval. | -| `reviewer_id` | integer | no | Returns merge requests which have the user as a [reviewer](../user/project/merge_requests/getting_started.md#enable-or-disable-merge-request-reviewers) with the given user `id`. `None` returns merge requests with no reviewers. `Any` returns merge requests with any reviewer. Mutually exclusive with `reviewer_username`. | -| `reviewer_username` | string | no | Returns merge requests which have the user as a [reviewer](../user/project/merge_requests/getting_started.md#enable-or-disable-merge-request-reviewers) with the given `username`. `None` returns merge requests with no reviewers. `Any` returns merge requests with any reviewer. Mutually exclusive with `reviewer_id`. | +| `reviewer_id` | integer | no | Returns merge requests which have the user as a [reviewer](../user/project/merge_requests/getting_started.md#reviewer) with the given user `id`. `None` returns merge requests with no reviewers. `Any` returns merge requests with any reviewer. Mutually exclusive with `reviewer_username`. | +| `reviewer_username` | string | no | Returns merge requests which have the user as a [reviewer](../user/project/merge_requests/getting_started.md#reviewer) with the given `username`. `None` returns merge requests with no reviewers. `Any` returns merge requests with any reviewer. Mutually exclusive with `reviewer_id`. | | `my_reaction_emoji` | string | no | Return merge requests reacted by the authenticated user by the given `emoji`. `None` returns issues not given a reaction. `Any` returns issues given at least one reaction. _([Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/14016) in GitLab 10.0)_. | | `source_branch` | string | no | Return merge requests with the given source branch. | | `target_branch` | string | no | Return merge requests with the given target branch. | diff --git a/doc/api/settings.md b/doc/api/settings.md index 6c996caed7b..05ea25a1955 100644 --- a/doc/api/settings.md +++ b/doc/api/settings.md @@ -282,6 +282,7 @@ listed in the descriptions of the relevant settings. | `first_day_of_week` | integer | no | Start day of the week for calendar views and date pickers. Valid values are `0` (default) for Sunday, `1` for Monday, and `6` for Saturday. | | `geo_node_allowed_ips` | string | yes | **(PREMIUM)** Comma-separated list of IPs and CIDRs of allowed secondary nodes. For example, `1.1.1.1, 2.2.2.0/24`. | | `geo_status_timeout` | integer | no | **(PREMIUM)** The amount of seconds after which a request to get a secondary node status times out. | +| `git_two_factor_session_expiry` | integer | no | **(PREMIUM)** Maximum duration (in minutes) of a session for Git operations when 2FA is enabled. | | `gitaly_timeout_default` | integer | no | Default Gitaly timeout, in seconds. This timeout is not enforced for Git fetch/push operations or Sidekiq jobs. Set to `0` to disable timeouts. | | `gitaly_timeout_fast` | integer | no | Gitaly fast operation timeout, in seconds. Some Gitaly operations are expected to be fast. If they exceed this threshold, there may be a problem with a storage shard and 'failing fast' can help maintain the stability of the GitLab instance. Set to `0` to disable timeouts. | | `gitaly_timeout_medium` | integer | no | Medium Gitaly timeout, in seconds. This should be a value between the Fast and the Default timeout. Set to `0` to disable timeouts. | diff --git a/doc/development/fe_guide/design_anti_patterns.md b/doc/development/fe_guide/design_anti_patterns.md new file mode 100644 index 00000000000..bf0865a954b --- /dev/null +++ b/doc/development/fe_guide/design_anti_patterns.md @@ -0,0 +1,219 @@ +--- +stage: none +group: unassigned +info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments +--- + +# Design Anti-patterns + +Anti-patterns may seem like good approaches at first, but it has been shown that they bring more ills than benefits. These should +generally be avoided. + +Throughout the GitLab codebase, there may be historic uses of these anti-patterns. Please [use descretion](https://about.gitlab.com/handbook/engineering/#balance-refactoring-and-velocity) +when figuring out whether or not to refactor, when touching code that uses one of these legacy patterns. + +**Please note:** For new features, anti-patterns are not necessarily prohibited, but it is **strongly suggested** to find another approach. + +## Shared Global Object (Anti-pattern) + +A shared global object is an instance of something that can be accessed from anywhere and therefore has no clear owner. + +Here's an example of this pattern applied to a Vuex Store: + +```javascript +const createStore = () => new Vuex.Store({ + actions, + state, + mutations +}); + +// Notice that we are forcing all references to this module to use the same single instance of the store. +// We are also creating the store at import-time and there is nothing which can automatically dispose of it. +// +// As an alternative, we should simply export the `createStore` and let the client manage the +// lifecycle and instance of the store. +export default createStore(); +``` + +### What problems do Shared Global Objects cause? + +Shared Global Objects are convenient because they can be accessed from anywhere. However, +the convenience does not always outweigh their heavy cost: + +- **No ownership.** There is no clear owner to these objects and therefore they assume a non-deterministic + and permanent lifecycle. This can be especially problematic for tests. +- **No access control.** When Shared Global Objects manage some state, this can create some very buggy and difficult + coupling situations because there is no access control to this object. +- **Possible circular references.** Shared Global Objects can also create some circular referencing situations since submodules + of the Shared Global Object can reference modules that reference itself (see + [this MR for an example](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/33366)). + +Here are some historic examples where this pattern was identified to be problematic: + +- [Reference to global Vuex store in IDE](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/36401) +- [Docs update to discourage singleton Vuex store](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/36952) + +### When could the Shared Global Object pattern be actually appropriate? + +Shared Global Object's solve the problem of making something globally accessible. This pattern +could be appropriate: + +- When a responsibility is truly global and should be referenced across the application + (e.g., an application-wide Event Bus). + +Even in these scenarios, please consider avoiding the Shared Global Object pattern because the +side-effects can be notoriously difficult to reason with. + +### References + +To read more on this topic, check out the following references: + +- [GlobalVariablesAreBad from C2 wiki](https://wiki.c2.com/?GlobalVariablesAreBad) + +## Singleton (Anti-pattern) + +The classic [Singleton pattern](https://en.wikipedia.org/wiki/Singleton_pattern) is an approach to ensure that only one +instance of a thing exists. + +Here's an example of this pattern: + +```javascript +class MyThing { + constructor() { + // ... + } + + // ... +} + +MyThing.instance = null; + +export const getThingInstance = () => { + if (MyThing.instance) { + return MyThing.instance; + } + + const instance = new MyThing(); + MyThing.instance = instance; + return instance; +}; +``` + +### What problems do Singletons cause? + +It is a big assumption that only one instance of a thing should exist. More often than not, +a Singleton is misused and causes very tight coupling amongst itself and the modules that reference it. + +Here are some historic examples where this pattern was identified to be problematic: + +- [Test issues caused by singleton class in IDE](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/30398#note_331174190) +- [Implicit Singleton created by module's shared variables](https://gitlab.com/gitlab-org/gitlab-vscode-extension/-/merge_requests/97#note_417515776) +- [Complexity caused by Singletons](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/29461#note_324585814) + +Here are some ills that Singletons often produce: + +1. **Non-deterministic tests.** Singletons encourage non-deterministic tests because the single instance is shared across + individual tests, often causing the state of one test to bleed into another. +1. **High coupling.** Under the hood, clients of a singleton class all share a single specific + instance of an object, which means this pattern inherits all the [problems of Shared Global Object](#what-problems-do-shared-global-objects-cause) + such as no clear ownership and no access control. These leads to high coupling situations that can + be buggy and difficult to untangle. +1. **Infectious.** Singletons are infectious, especially when they manage state. Consider the component + [RepoEditor](https://gitlab.com/gitlab-org/gitlab/blob/27ad6cb7b76430fbcbaf850df68c338d6719ed2b/app%2Fassets%2Fjavascripts%2Fide%2Fcomponents%2Frepo_editor.vue#L0-1) + used in the Web IDE. This component interfaces with a Singleton [Editor](https://gitlab.com/gitlab-org/gitlab/blob/862ad57c44ec758ef3942ac2e7a2bd40a37a9c59/app%2Fassets%2Fjavascripts%2Fide%2Flib%2Feditor.js#L21) + which manages some state for working with Monaco. Because of the Singleton nature of the Editor class, + the component `RepoEditor` is now forced to be a Singleton as well. Multiple instances of this component + would cause production issues because no one truly owns the instance of `Editor`. + +### Why is the Singleton pattern popular in other languages like Java? + +This is because of the limitations of languages like Java where everything has to be wrapped +in a class. In JavaScript we have things like object and function literals where we can solve +many problems with a module that simply exports utility functions. + +### When could the Singleton pattern be actually appropriate?** + +Singletons solve the problem of enforcing there to be only 1 instance of a thing. It's possible +that a Singleton could be appropriate in the following rare cases: + +- We need to manage some resource that **MUST** have just 1 instance (i.e. some hardware restriction). +- There is a real [cross-cutting concern](https://en.wikipedia.org/wiki/Cross-cutting_concern) (e.g., logging) and a Singleton provides the simplest API. + +Even in these scenarios, please consider avoiding the Singleton pattern. + +### What alternatives are there to the Singleton pattern? + +#### Utility Functions + +When no state needs to be managed, we can simply export utility functions from a module without +messing with any class instantiation. + +```javascript +// bad - Singleton +export class ThingUtils { + static create() { + if(this.instance) { + return this.instance; + } + + this.instance = new ThingUtils(); + return this.instance; + } + + bar() { /* ... */ } + + fuzzify(id) { /* ... */ } +} + +// good - Utility functions +export const bar = () => { /* ... */ }; + +export const fuzzify = (id) => { /* ... */ }; +``` + +#### Dependency Injection + +[Dependency Injection](https://en.wikipedia.org/wiki/Dependency_injection) is an approach which breaks +coupling by declaring a module's dependencies to be injected from outside the module (e.g., through constructor parameters, a bon-a-fide Dependency Injection framework, and even Vue's `provide/inject`). + +```javascript +// bad - Vue component coupled to Singleton +export default { + created() { + this.mediator = MyFooMediator.getInstance(); + }, +}; + +// good - Vue component declares dependency +export default { + inject: ['mediator'] +}; +``` + +```javascript +// bad - We're not sure where the singleton is in it's lifecycle so we init it here. +export class Foo { + constructor() { + Bar.getInstance().init(); + } + + stuff() { + return Bar.getInstance().doStuff(); + } +} + +// good - Lets receive this dependency as a constructor argument. +// It's also not our responsibility to manage the lifecycle. +export class Foo { + constructor(bar) { + this.bar = bar; + } + + stuff() { + return this.bar.doStuff(); + } +} +``` + +In this example, the lifecycle and implementation details of `mediator` are all managed +**outside** the component (most likely the page entrypoint). diff --git a/doc/development/fe_guide/design_patterns.md b/doc/development/fe_guide/design_patterns.md index d6b1f38b417..c769d0767e7 100644 --- a/doc/development/fe_guide/design_patterns.md +++ b/doc/development/fe_guide/design_patterns.md @@ -6,79 +6,11 @@ info: To determine the technical writer assigned to the Stage/Group associated w # Design Patterns -## Singletons +The following design patterns are suggested approaches for solving common problems. Use discretion when evaluating +if a certain pattern makes sense in your situation. Just because it is a pattern, doesn't mean it is a good one for your problem. -When exactly one object is needed for a given task, prefer to define it as a -`class` rather than as an object literal. Prefer also to explicitly restrict -instantiation, unless flexibility is important (such as for testing). +**Please note:** When adding a design pattern to this document, be sure to clearly state the **problem it solves**. -```javascript -// bad +## TBD -const MyThing = { - prop1: 'hello', - method1: () => {} -}; - -export default MyThing; - -// good - -class MyThing { - constructor() { - this.prop1 = 'hello'; - } - method1() {} -} - -export default new MyThing(); - -// best - -export default class MyThing { - constructor() { - if (!MyThing.prototype.singleton) { - this.init(); - MyThing.prototype.singleton = this; - } - return MyThing.prototype.singleton; - } - - init() { - this.prop1 = 'hello'; - } - - method1() {} -} - -``` - -## Manipulating the DOM in a JS Class - -When writing a class that needs to manipulate the DOM guarantee a container option is provided. -This can be used when we need that class to be instantiated more than once in the same page. - -Bad: - -```javascript -class Foo { - constructor() { - document.querySelector('.bar'); - } -} -new Foo(); -``` - -Good: - -```javascript -class Foo { - constructor(opts) { - document.querySelector(`${opts.container} .bar`); - } -} - -new Foo({ container: '.my-element' }); -``` - -You can find an example of the above in this [class](https://gitlab.com/gitlab-org/gitlab/blob/master/app/assets/javascripts/mini_pipeline_graph_dropdown.js); +Stay tuned! diff --git a/doc/development/fe_guide/index.md b/doc/development/fe_guide/index.md index f590473c3c3..6d2e6b65b43 100644 --- a/doc/development/fe_guide/index.md +++ b/doc/development/fe_guide/index.md @@ -56,7 +56,11 @@ Reusable components with technical and usage guidelines can be found in our ## Design Patterns -Common JavaScript [design patterns](design_patterns.md) in the GitLab codebase. +JavaScript [design patterns](design_patterns.md) in the GitLab codebase. + +## Design Anti-patterns + +JavaScript [design anti-patterns](design_anti_patterns.md) we try to avoid. ## Vue.js Best Practices diff --git a/doc/user/admin_area/settings/account_and_limit_settings.md b/doc/user/admin_area/settings/account_and_limit_settings.md index e497c006f24..0c991aa52df 100644 --- a/doc/user/admin_area/settings/account_and_limit_settings.md +++ b/doc/user/admin_area/settings/account_and_limit_settings.md @@ -131,6 +131,23 @@ add the line below to `/etc/gitlab/gitlab.rb` before increasing the max attachme nginx['client_max_body_size'] = "200m" ``` +## Customize session duration for Git Operations when 2FA is enabled **(PREMIUM)** + +> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/296669) in GitLab 13.9. +> - It's deployed behind a feature flag, disabled by default. +> - It's disabled on GitLab.com. +> - It's not recommended for production use. +> - To use it in GitLab self-managed instances, ask a GitLab administrator to [enable it](../../../security/two_factor_authentication.md#enable-or-disable-two-factor-authentication-2fa-for-git-operations) + +GitLab administrators can choose to customize the session duration (in minutes) for Git operations when 2FA is enabled. The default is 15 and this can be set to a value between 1 and 10080. + +To set a limit on how long these sessions are valid: + +1. Navigate to **Admin Area > Settings > General**. +1. Expand the **Account and limit** section. +1. Fill in the **Session duration for Git operations when 2FA is enabled (minutes)** field. +1. Click **Save changes**. + ## Limiting lifetime of personal access tokens **(ULTIMATE SELF)** > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/3649) in GitLab Ultimate 12.6. diff --git a/doc/user/project/merge_requests/getting_started.md b/doc/user/project/merge_requests/getting_started.md index 5be277c2f29..9fde7037a60 100644 --- a/doc/user/project/merge_requests/getting_started.md +++ b/doc/user/project/merge_requests/getting_started.md @@ -115,16 +115,9 @@ It is also possible to manage multiple assignees: ### Reviewer > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/216054) in GitLab 13.5. -> - It was [deployed behind a feature flag](../../../user/feature_flags.md), disabled by default. -> - [Became enabled by default](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49787) on GitLab 13.7. -> - It's enabled on GitLab.com. -> - It's recommended for production use. -> - It can be enabled or disabled for a single project. -> - For GitLab self-managed instances, GitLab administrators can opt to [disable it](#enable-or-disable-merge-request-reviewers). **(FREE SELF)** +> - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/245190) in GitLab 13.9. WARNING: -This feature might not be available to you. Check the **version history** note above for details. - Requesting a code review is an important part of contributing code. However, deciding who should review your code and asking for a review are no easy tasks. Using the "assignee" field for both authors and reviewers makes it hard for others to determine who's doing what on a merge request. @@ -137,31 +130,6 @@ This makes it easy to determine the relevant roles for the users involved in the To request it, open the **Reviewers** drop-down box to search for the user you wish to get a review from. -#### Enable or disable Merge Request Reviewers **(FREE SELF)** - -Merge Request Reviewers is under development but ready for production use. -It is deployed behind a feature flag that is **enabled by default**. -[GitLab administrators with access to the GitLab Rails console](../../../administration/feature_flags.md) -can opt to disable it. - -To enable it: - -```ruby -# For the instance -Feature.enable(:merge_request_reviewers) -# For a single project -Feature.enable(:merge_request_reviewers, Project.find(<project id>)) -``` - -To disable it: - -```ruby -# For the instance -Feature.disable(:merge_request_reviewers) -# For a single project -Feature.disable(:merge_request_reviewers, Project.find(<project id>)) -``` - #### Approval Rule information for Reviewers **(PREMIUM)** > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/233736) in GitLab 13.8. diff --git a/lib/api/entities/merge_request_basic.rb b/lib/api/entities/merge_request_basic.rb index 7f1b5b87725..88c84c494e2 100644 --- a/lib/api/entities/merge_request_basic.rb +++ b/lib/api/entities/merge_request_basic.rb @@ -27,7 +27,7 @@ module API expose(:downvotes) { |merge_request, options| issuable_metadata.downvotes } expose :author, :assignees, :assignee, using: Entities::UserBasic - expose :reviewers, if: -> (merge_request, _) { merge_request.allows_reviewers? }, using: Entities::UserBasic + expose :reviewers, using: Entities::UserBasic expose :source_project_id, :target_project_id expose :labels do |merge_request, options| if options[:with_labels_details] diff --git a/lib/gitlab/auth/otp/session_enforcer.rb b/lib/gitlab/auth/otp/session_enforcer.rb index 8cc280756cc..6488fa0f945 100644 --- a/lib/gitlab/auth/otp/session_enforcer.rb +++ b/lib/gitlab/auth/otp/session_enforcer.rb @@ -5,7 +5,6 @@ module Gitlab module Otp class SessionEnforcer OTP_SESSIONS_NAMESPACE = 'session:otp' - DEFAULT_EXPIRATION = 15.minutes.to_i def initialize(key) @key = key @@ -13,7 +12,7 @@ module Gitlab def update_session Gitlab::Redis::SharedState.with do |redis| - redis.setex(key_name, DEFAULT_EXPIRATION, true) + redis.setex(key_name, session_expiry_in_seconds, true) end end @@ -30,6 +29,10 @@ module Gitlab def key_name @key_name ||= "#{OTP_SESSIONS_NAMESPACE}:#{key.id}" end + + def session_expiry_in_seconds + Gitlab::CurrentSettings.git_two_factor_session_expiry.minutes.to_i + end end end end diff --git a/lib/gitlab/experimentation.rb b/lib/gitlab/experimentation.rb index 3cb4798a940..6e401e5d6c8 100644 --- a/lib/gitlab/experimentation.rb +++ b/lib/gitlab/experimentation.rb @@ -92,10 +92,6 @@ module Gitlab tracking_category: 'Growth::Activation::Experiment::CiSyntaxTemplates', rollout_strategy: :user }, - pipelines_empty_state: { - tracking_category: 'Growth::Activation::Experiment::PipelinesEmptyState', - rollout_strategy: :user - }, invite_members_new_dropdown: { tracking_category: 'Growth::Expansion::Experiment::InviteMembersNewDropdown' }, diff --git a/lib/gitlab/quick_actions/merge_request_actions.rb b/lib/gitlab/quick_actions/merge_request_actions.rb index 90745dde0af..6a404c34044 100644 --- a/lib/gitlab/quick_actions/merge_request_actions.rb +++ b/lib/gitlab/quick_actions/merge_request_actions.rb @@ -181,8 +181,7 @@ module Gitlab end types MergeRequest condition do - Feature.enabled?(:merge_request_reviewers, project, default_enabled: :yaml) && - current_user.can?(:"admin_#{quick_action_target.to_ability_name}", project) + current_user.can?(:"admin_#{quick_action_target.to_ability_name}", project) end parse_params do |reviewer_param| extract_users(reviewer_param) @@ -221,7 +220,6 @@ module Gitlab types MergeRequest condition do quick_action_target.persisted? && - Feature.enabled?(:merge_request_reviewers, project, default_enabled: :yaml) && quick_action_target.reviewers.any? && current_user.can?(:"admin_#{quick_action_target.to_ability_name}", project) end diff --git a/lib/tasks/brakeman.rake b/lib/tasks/brakeman.rake index 2301ec9b228..44d2071751f 100644 --- a/lib/tasks/brakeman.rake +++ b/lib/tasks/brakeman.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + desc 'Security check via brakeman' task :brakeman do # We get 0 warnings at level 'w3' but we would like to reach 'w2'. Merge diff --git a/lib/tasks/cache.rake b/lib/tasks/cache.rake index 6af91d473a6..4d698e56444 100644 --- a/lib/tasks/cache.rake +++ b/lib/tasks/cache.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :cache do namespace :clear do REDIS_CLEAR_BATCH_SIZE = 1000 # There seems to be no speedup when pushing beyond 1,000 diff --git a/lib/tasks/ci/cleanup.rake b/lib/tasks/ci/cleanup.rake index 978a42be638..31c3928e797 100644 --- a/lib/tasks/ci/cleanup.rake +++ b/lib/tasks/ci/cleanup.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :ci do namespace :cleanup do desc "GitLab | CI | Clean running builds" diff --git a/lib/tasks/cleanup.rake b/lib/tasks/cleanup.rake index 8574f26dbdc..c13da77217e 100644 --- a/lib/tasks/cleanup.rake +++ b/lib/tasks/cleanup.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :gitlab do namespace :cleanup do desc "GitLab | Cleanup | Delete moved repositories" diff --git a/lib/tasks/config_lint.rake b/lib/tasks/config_lint.rake index ddbcf1e1eb8..9bbefaa2d3a 100644 --- a/lib/tasks/config_lint.rake +++ b/lib/tasks/config_lint.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module ConfigLint def self.run(files) failures = files.reject do |file| diff --git a/lib/tasks/db_obsolete_ignored_columns.rake b/lib/tasks/db_obsolete_ignored_columns.rake index 00f60231f4f..cf35a355ce9 100644 --- a/lib/tasks/db_obsolete_ignored_columns.rake +++ b/lib/tasks/db_obsolete_ignored_columns.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + desc 'Show a list of obsolete `ignored_columns`' task 'db:obsolete_ignored_columns' => :environment do list = Gitlab::Database::ObsoleteIgnoredColumns.new.execute diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake index b3ba2434855..cb01f229cd3 100644 --- a/lib/tasks/dev.rake +++ b/lib/tasks/dev.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + task dev: ["dev:setup"] namespace :dev do diff --git a/lib/tasks/downtime_check.rake b/lib/tasks/downtime_check.rake index ce97ed50fc7..3428e3f8f53 100644 --- a/lib/tasks/downtime_check.rake +++ b/lib/tasks/downtime_check.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + desc 'Checks if migrations in a branch require downtime' task downtime_check: :environment do repo = if defined?(Gitlab::License) diff --git a/lib/tasks/eslint.rake b/lib/tasks/eslint.rake index 51f5d768102..ad63de66c81 100644 --- a/lib/tasks/eslint.rake +++ b/lib/tasks/eslint.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + unless Rails.env.production? desc "GitLab | Run ESLint" task eslint: ['yarn:check'] do diff --git a/lib/tasks/file_hooks.rake b/lib/tasks/file_hooks.rake index f767d63fe0d..a892d36b48e 100644 --- a/lib/tasks/file_hooks.rake +++ b/lib/tasks/file_hooks.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :file_hooks do desc 'Validate existing file hooks' task validate: :environment do diff --git a/lib/tasks/frontend.rake b/lib/tasks/frontend.rake index 176693031d3..b2d2c4e3f2b 100644 --- a/lib/tasks/frontend.rake +++ b/lib/tasks/frontend.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + unless Rails.env.production? namespace :frontend do desc 'GitLab | Frontend | Generate fixtures for JavaScript tests' diff --git a/lib/tasks/gemojione.rake b/lib/tasks/gemojione.rake index 85393bba9a6..a4600a0ed16 100644 --- a/lib/tasks/gemojione.rake +++ b/lib/tasks/gemojione.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :gemojione do desc 'Generates Emoji SHA256 digests' diff --git a/lib/tasks/gitlab/artifacts/check.rake b/lib/tasks/gitlab/artifacts/check.rake index a105261ed51..057bb17dbda 100644 --- a/lib/tasks/gitlab/artifacts/check.rake +++ b/lib/tasks/gitlab/artifacts/check.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :gitlab do namespace :artifacts do desc 'GitLab | Artifacts | Check integrity of uploaded job artifacts' diff --git a/lib/tasks/gitlab/artifacts/migrate.rake b/lib/tasks/gitlab/artifacts/migrate.rake index 871fdfb4fde..94867e1a16a 100644 --- a/lib/tasks/gitlab/artifacts/migrate.rake +++ b/lib/tasks/gitlab/artifacts/migrate.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'logger' require 'resolv-replace' diff --git a/lib/tasks/gitlab/backup.rake b/lib/tasks/gitlab/backup.rake index de2dfca8c1b..c53ef8382b8 100644 --- a/lib/tasks/gitlab/backup.rake +++ b/lib/tasks/gitlab/backup.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'active_record/fixtures' namespace :gitlab do diff --git a/lib/tasks/gitlab/bulk_add_permission.rake b/lib/tasks/gitlab/bulk_add_permission.rake index 56cbbae1f67..df0c6a260a2 100644 --- a/lib/tasks/gitlab/bulk_add_permission.rake +++ b/lib/tasks/gitlab/bulk_add_permission.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :gitlab do namespace :import do desc "GitLab | Import | Add all users to all projects (admin users are added as maintainers)" diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake index 9e60a585330..d4e38100609 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :gitlab do desc 'GitLab | Check the configuration of GitLab and its environment' task check: :gitlab_environment do diff --git a/lib/tasks/gitlab/container_registry.rake b/lib/tasks/gitlab/container_registry.rake index cd18c873a5a..086f99971bc 100644 --- a/lib/tasks/gitlab/container_registry.rake +++ b/lib/tasks/gitlab/container_registry.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :gitlab do namespace :container_registry do desc "GitLab | Container Registry | Configure" diff --git a/lib/tasks/gitlab/db.rake b/lib/tasks/gitlab/db.rake index 901e349ea31..bf0eb6785df 100644 --- a/lib/tasks/gitlab/db.rake +++ b/lib/tasks/gitlab/db.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :gitlab do namespace :db do desc 'GitLab | DB | Manually insert schema migration version' diff --git a/lib/tasks/gitlab/doctor/secrets.rake b/lib/tasks/gitlab/doctor/secrets.rake index 3fdef9dfc80..6e3f474312c 100644 --- a/lib/tasks/gitlab/doctor/secrets.rake +++ b/lib/tasks/gitlab/doctor/secrets.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :gitlab do namespace :doctor do desc "GitLab | Check if the database encrypted values can be decrypted using current secrets" diff --git a/lib/tasks/gitlab/exclusive_lease.rake b/lib/tasks/gitlab/exclusive_lease.rake index 63b06d5251a..bee9782f373 100644 --- a/lib/tasks/gitlab/exclusive_lease.rake +++ b/lib/tasks/gitlab/exclusive_lease.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :gitlab do namespace :exclusive_lease do desc 'GitLab | Exclusive Lease | Clear existing exclusive leases for specified scope (default: *)' diff --git a/lib/tasks/gitlab/external_diffs.rake b/lib/tasks/gitlab/external_diffs.rake index 08f25914007..7a5fa07aed1 100644 --- a/lib/tasks/gitlab/external_diffs.rake +++ b/lib/tasks/gitlab/external_diffs.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :gitlab do namespace :external_diffs do desc "Override external diffs in file storage to be in object storage instead. This does not change the actual location of the data" diff --git a/lib/tasks/gitlab/features.rake b/lib/tasks/gitlab/features.rake index 2309aa5d214..e44328e0de1 100644 --- a/lib/tasks/gitlab/features.rake +++ b/lib/tasks/gitlab/features.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :gitlab do namespace :features do desc 'GitLab | Features | Enable direct Git access via Rugged for NFS' diff --git a/lib/tasks/gitlab/generate_sample_prometheus_data.rake b/lib/tasks/gitlab/generate_sample_prometheus_data.rake index 250eaaa5568..4cd75af9d00 100644 --- a/lib/tasks/gitlab/generate_sample_prometheus_data.rake +++ b/lib/tasks/gitlab/generate_sample_prometheus_data.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :gitlab do desc "GitLab | Generate Sample Prometheus Data" task :generate_sample_prometheus_data, [:environment_id] => :gitlab_environment do |_, args| diff --git a/lib/tasks/gitlab/git.rake b/lib/tasks/gitlab/git.rake index abb15f29328..9c5549b4a54 100644 --- a/lib/tasks/gitlab/git.rake +++ b/lib/tasks/gitlab/git.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :gitlab do namespace :git do desc 'GitLab | Git | Check all repos integrity' diff --git a/lib/tasks/gitlab/gitaly.rake b/lib/tasks/gitlab/gitaly.rake index 49d2d3d62a2..9e474b00ba7 100644 --- a/lib/tasks/gitlab/gitaly.rake +++ b/lib/tasks/gitlab/gitaly.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :gitlab do namespace :gitaly do desc 'GitLab | Gitaly | Install or upgrade gitaly' diff --git a/lib/tasks/gitlab/helpers.rake b/lib/tasks/gitlab/helpers.rake index 14d1125a03d..b61b1833c5a 100644 --- a/lib/tasks/gitlab/helpers.rake +++ b/lib/tasks/gitlab/helpers.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # Prevent StateMachine warnings from outputting during a cron task StateMachines::Machine.ignore_method_conflicts = true if ENV['CRON'] diff --git a/lib/tasks/gitlab/import.rake b/lib/tasks/gitlab/import.rake index 701d40b7929..bf0ba40fb31 100644 --- a/lib/tasks/gitlab/import.rake +++ b/lib/tasks/gitlab/import.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :gitlab do namespace :import do # How to use: diff --git a/lib/tasks/gitlab/import_export.rake b/lib/tasks/gitlab/import_export.rake index adf696350d7..72598cdf863 100644 --- a/lib/tasks/gitlab/import_export.rake +++ b/lib/tasks/gitlab/import_export.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :gitlab do namespace :import_export do desc 'GitLab | Import/Export | Show Import/Export version' diff --git a/lib/tasks/gitlab/info.rake b/lib/tasks/gitlab/info.rake index d85c8fc7949..2826002bdc2 100644 --- a/lib/tasks/gitlab/info.rake +++ b/lib/tasks/gitlab/info.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :gitlab do namespace :env do desc 'GitLab | Env | Show information about GitLab and its environment' diff --git a/lib/tasks/gitlab/ldap.rake b/lib/tasks/gitlab/ldap.rake index fe7920c621f..3b2834c0008 100644 --- a/lib/tasks/gitlab/ldap.rake +++ b/lib/tasks/gitlab/ldap.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :gitlab do namespace :ldap do desc 'GitLab | LDAP | Rename provider' diff --git a/lib/tasks/gitlab/lfs/check.rake b/lib/tasks/gitlab/lfs/check.rake index 869463d4e5d..582b87337ae 100644 --- a/lib/tasks/gitlab/lfs/check.rake +++ b/lib/tasks/gitlab/lfs/check.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :gitlab do namespace :lfs do desc 'GitLab | LFS | Check integrity of uploaded LFS objects' diff --git a/lib/tasks/gitlab/lfs/migrate.rake b/lib/tasks/gitlab/lfs/migrate.rake index 3d4c847a0f0..05249a126bc 100644 --- a/lib/tasks/gitlab/lfs/migrate.rake +++ b/lib/tasks/gitlab/lfs/migrate.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'logger' desc "GitLab | LFS | Migrate LFS objects to remote storage" diff --git a/lib/tasks/gitlab/list_repos.rake b/lib/tasks/gitlab/list_repos.rake index b854c34a8e5..56ec94d2aef 100644 --- a/lib/tasks/gitlab/list_repos.rake +++ b/lib/tasks/gitlab/list_repos.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :gitlab do task list_repos: :environment do scope = Project diff --git a/lib/tasks/gitlab/packages/events.rake b/lib/tasks/gitlab/packages/events.rake index cfe97984dda..4bf4ce430f1 100644 --- a/lib/tasks/gitlab/packages/events.rake +++ b/lib/tasks/gitlab/packages/events.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'logger' desc "GitLab | Packages | Events | Generate hll counter events file for packages" diff --git a/lib/tasks/gitlab/packages/migrate.rake b/lib/tasks/gitlab/packages/migrate.rake index cd6dcf78da3..20a8c51db66 100644 --- a/lib/tasks/gitlab/packages/migrate.rake +++ b/lib/tasks/gitlab/packages/migrate.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'logger' desc "GitLab | Packages | Migrate packages files to remote storage" diff --git a/lib/tasks/gitlab/pages.rake b/lib/tasks/gitlab/pages.rake index 59c57a66928..80550317dba 100644 --- a/lib/tasks/gitlab/pages.rake +++ b/lib/tasks/gitlab/pages.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'logger' namespace :gitlab do diff --git a/lib/tasks/gitlab/praefect.rake b/lib/tasks/gitlab/praefect.rake index a9b126ae379..346df3e0c75 100644 --- a/lib/tasks/gitlab/praefect.rake +++ b/lib/tasks/gitlab/praefect.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :gitlab do namespace :praefect do def int?(string) diff --git a/lib/tasks/gitlab/seed.rake b/lib/tasks/gitlab/seed.rake index d758280ba69..36761165af5 100644 --- a/lib/tasks/gitlab/seed.rake +++ b/lib/tasks/gitlab/seed.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :gitlab do namespace :seed do desc "GitLab | Seed | Seeds issues" diff --git a/lib/tasks/gitlab/setup.rake b/lib/tasks/gitlab/setup.rake index 50774de77c9..31bd80e78d4 100644 --- a/lib/tasks/gitlab/setup.rake +++ b/lib/tasks/gitlab/setup.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :gitlab do desc "GitLab | Setup production application" task setup: :gitlab_environment do diff --git a/lib/tasks/gitlab/shell.rake b/lib/tasks/gitlab/shell.rake index edbaec85bd9..b3abc48f8e0 100644 --- a/lib/tasks/gitlab/shell.rake +++ b/lib/tasks/gitlab/shell.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :gitlab do namespace :shell do desc "GitLab | Shell | Install or upgrade gitlab-shell" diff --git a/lib/tasks/gitlab/storage.rake b/lib/tasks/gitlab/storage.rake index f7819fd974b..ede6b6af80b 100644 --- a/lib/tasks/gitlab/storage.rake +++ b/lib/tasks/gitlab/storage.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :gitlab do namespace :storage do desc 'GitLab | Storage | Migrate existing projects to Hashed Storage' diff --git a/lib/tasks/gitlab/tcp_check.rake b/lib/tasks/gitlab/tcp_check.rake index 1400f57d6b9..4790d86832d 100644 --- a/lib/tasks/gitlab/tcp_check.rake +++ b/lib/tasks/gitlab/tcp_check.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :gitlab do desc "GitLab | Check TCP connectivity to a specific host and port" task :tcp_check, [:host, :port] => :environment do |_t, args| diff --git a/lib/tasks/gitlab/test.rake b/lib/tasks/gitlab/test.rake index 2222807fe13..a83ba69bc75 100644 --- a/lib/tasks/gitlab/test.rake +++ b/lib/tasks/gitlab/test.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :gitlab do desc "GitLab | Run all tests" task :test do diff --git a/lib/tasks/gitlab/two_factor.rake b/lib/tasks/gitlab/two_factor.rake index 6a9e87e1541..9d10976fbce 100644 --- a/lib/tasks/gitlab/two_factor.rake +++ b/lib/tasks/gitlab/two_factor.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :gitlab do namespace :two_factor do desc "GitLab | 2FA | Disable Two-factor authentication (2FA) for all users" diff --git a/lib/tasks/gitlab/update_templates.rake b/lib/tasks/gitlab/update_templates.rake index fdcd34320b1..e3a4e7f50b8 100644 --- a/lib/tasks/gitlab/update_templates.rake +++ b/lib/tasks/gitlab/update_templates.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :gitlab do desc "GitLab | Update templates" task :update_templates do diff --git a/lib/tasks/gitlab/uploads/check.rake b/lib/tasks/gitlab/uploads/check.rake index 2be2ec7f9c9..8ccc84d15f4 100644 --- a/lib/tasks/gitlab/uploads/check.rake +++ b/lib/tasks/gitlab/uploads/check.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :gitlab do namespace :uploads do desc 'GitLab | Uploads | Check integrity of uploaded files' diff --git a/lib/tasks/gitlab/uploads/migrate.rake b/lib/tasks/gitlab/uploads/migrate.rake index 879b07da1df..6052ff90341 100644 --- a/lib/tasks/gitlab/uploads/migrate.rake +++ b/lib/tasks/gitlab/uploads/migrate.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :gitlab do namespace :uploads do namespace :migrate do diff --git a/lib/tasks/gitlab/uploads/sanitize.rake b/lib/tasks/gitlab/uploads/sanitize.rake index 4f23a0a5d82..eec423cbb8b 100644 --- a/lib/tasks/gitlab/uploads/sanitize.rake +++ b/lib/tasks/gitlab/uploads/sanitize.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :gitlab do namespace :uploads do namespace :sanitize do diff --git a/lib/tasks/gitlab/usage_data.rake b/lib/tasks/gitlab/usage_data.rake index 0e729fa8833..95072444fcf 100644 --- a/lib/tasks/gitlab/usage_data.rake +++ b/lib/tasks/gitlab/usage_data.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :gitlab do namespace :usage_data do desc 'GitLab | UsageData | Generate raw SQLs for usage ping in YAML' diff --git a/lib/tasks/gitlab/user_management.rake b/lib/tasks/gitlab/user_management.rake index f47e549e795..29f2360f64a 100644 --- a/lib/tasks/gitlab/user_management.rake +++ b/lib/tasks/gitlab/user_management.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :gitlab do namespace :user_management do desc "GitLab | User management | Update all users of a group with personal project limit to 0 and can_create_group to false" diff --git a/lib/tasks/gitlab/web_hook.rake b/lib/tasks/gitlab/web_hook.rake index b242329d720..091743485c9 100644 --- a/lib/tasks/gitlab/web_hook.rake +++ b/lib/tasks/gitlab/web_hook.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :gitlab do namespace :web_hook do desc "GitLab | Webhook | Adds a webhook to the projects" diff --git a/lib/tasks/gitlab/workhorse.rake b/lib/tasks/gitlab/workhorse.rake index 2d72a01f66f..0d9f8efa64f 100644 --- a/lib/tasks/gitlab/workhorse.rake +++ b/lib/tasks/gitlab/workhorse.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :gitlab do namespace :workhorse do desc "GitLab | Workhorse | Install or upgrade gitlab-workhorse" diff --git a/lib/tasks/gitlab/x509/update.rake b/lib/tasks/gitlab/x509/update.rake index eaba9196acf..de878a3d093 100644 --- a/lib/tasks/gitlab/x509/update.rake +++ b/lib/tasks/gitlab/x509/update.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'logger' desc "GitLab | X509 | Update signatures when certificate store has changed" diff --git a/lib/tasks/gitlab_danger.rake b/lib/tasks/gitlab_danger.rake index deff6484231..5df4a8ce4f1 100644 --- a/lib/tasks/gitlab_danger.rake +++ b/lib/tasks/gitlab_danger.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + desc 'Run local Danger rules' task :danger_local do require_relative '../../tooling/gitlab_danger' diff --git a/lib/tasks/grape.rake b/lib/tasks/grape.rake index ea2698da606..c72403a375a 100644 --- a/lib/tasks/grape.rake +++ b/lib/tasks/grape.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :grape do desc 'Print compiled grape routes' task routes: :environment do diff --git a/lib/tasks/haml-lint.rake b/lib/tasks/haml-lint.rake index 305e15d69d5..270793359e1 100644 --- a/lib/tasks/haml-lint.rake +++ b/lib/tasks/haml-lint.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + unless Rails.env.production? require 'haml_lint/rake_task' require Rails.root.join('haml_lint/inline_javascript') diff --git a/lib/tasks/import.rake b/lib/tasks/import.rake index 500891df43d..633beb132d8 100644 --- a/lib/tasks/import.rake +++ b/lib/tasks/import.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'benchmark' require 'rainbow/ext/string' diff --git a/lib/tasks/karma.rake b/lib/tasks/karma.rake index 36590010406..fa3f8805159 100644 --- a/lib/tasks/karma.rake +++ b/lib/tasks/karma.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + unless Rails.env.production? namespace :karma do # alias exists for legacy reasons diff --git a/lib/tasks/lint.rake b/lib/tasks/lint.rake index 7a4d09bb6d4..5d60bc41f21 100644 --- a/lib/tasks/lint.rake +++ b/lib/tasks/lint.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + unless Rails.env.production? namespace :lint do task :static_verification_env do diff --git a/lib/tasks/migrate/composite_primary_keys.rake b/lib/tasks/migrate/composite_primary_keys.rake index 732dedf4d4f..68f7c4d6c4a 100644 --- a/lib/tasks/migrate/composite_primary_keys.rake +++ b/lib/tasks/migrate/composite_primary_keys.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + namespace :gitlab do namespace :db do desc 'GitLab | DB | Adds primary keys to tables that only have composite unique keys' diff --git a/lib/tasks/migrate/migrate_iids.rake b/lib/tasks/migrate/migrate_iids.rake index cb7c496c31c..e0666a87656 100644 --- a/lib/tasks/migrate/migrate_iids.rake +++ b/lib/tasks/migrate/migrate_iids.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + desc "GitLab | Build internal ids for issues and merge requests" task migrate_iids: :environment do puts 'Issues'.color(:yellow) diff --git a/lib/tasks/migrate/setup_postgresql.rake b/lib/tasks/migrate/setup_postgresql.rake index 4c8f13b63a4..27dd9e842ff 100644 --- a/lib/tasks/migrate/setup_postgresql.rake +++ b/lib/tasks/migrate/setup_postgresql.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + desc 'GitLab | Generate PostgreSQL Password Hash' task :postgresql_md5_hash do require 'digest' diff --git a/lib/tasks/pngquant.rake b/lib/tasks/pngquant.rake index 63bc1c7c16e..45c0288cadf 100644 --- a/lib/tasks/pngquant.rake +++ b/lib/tasks/pngquant.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + return if Rails.env.production? require 'png_quantizator' diff --git a/lib/tasks/rubocop.rake b/lib/tasks/rubocop.rake index 78ffccc9d06..f5d16835347 100644 --- a/lib/tasks/rubocop.rake +++ b/lib/tasks/rubocop.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + unless Rails.env.production? require 'rubocop/rake_task' diff --git a/lib/tasks/scss-lint.rake b/lib/tasks/scss-lint.rake index 250fd8699e4..8a4809f80fd 100644 --- a/lib/tasks/scss-lint.rake +++ b/lib/tasks/scss-lint.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + unless Rails.env.production? require 'scss_lint/rake_task' diff --git a/lib/tasks/setup.rake b/lib/tasks/setup.rake index 4c79ffbfa6b..bae22f9a590 100644 --- a/lib/tasks/setup.rake +++ b/lib/tasks/setup.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + desc "GitLab | Setup gitlab db" task :setup do Rake::Task["gitlab:setup"].invoke diff --git a/lib/tasks/test.rake b/lib/tasks/test.rake index b52af81fc16..b24817468c6 100644 --- a/lib/tasks/test.rake +++ b/lib/tasks/test.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + Rake::Task["test"].clear desc "GitLab | Run all tests" diff --git a/lib/tasks/tokens.rake b/lib/tasks/tokens.rake index 46635cd7c8f..b0ff2cce482 100644 --- a/lib/tasks/tokens.rake +++ b/lib/tasks/tokens.rake @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require_relative '../../app/models/concerns/token_authenticatable.rb' require_relative '../../app/models/concerns/token_authenticatable_strategies/base.rb' require_relative '../../app/models/concerns/token_authenticatable_strategies/insecure.rb' diff --git a/lib/uploaded_file.rb b/lib/uploaded_file.rb index 79920968603..a8935ec542e 100644 --- a/lib/uploaded_file.rb +++ b/lib/uploaded_file.rb @@ -78,9 +78,15 @@ class UploadedFile def sanitize_filename(name) name = name.tr("\\", "/") # work-around for IE name = ::File.basename(name) + + pre_sanitized_name = name + name = name.gsub(CarrierWave::SanitizedFile.sanitize_regexp, "_") name = "_#{name}" if name =~ /\A\.+\z/ name = "unnamed" if name.empty? + + @filename_sanitized = name != pre_sanitized_name + name.mb_chars.to_s end @@ -92,6 +98,10 @@ class UploadedFile @tempfile&.close end + def filename_sanitized? + @filename_sanitized + end + alias_method :local_path, :path def method_missing(method_name, *args, &block) #:nodoc: diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 7d2fb3e0788..de8e1357c7f 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -1713,7 +1713,7 @@ msgstr "" msgid "Add deploy freeze" msgstr "" -msgid "Add deploy keys to grant read/write access to this repository. %{link_start}What are Deploy Keys?%{link_end}" +msgid "Add deploy keys to grant read/write access to this repository. %{link_start}What are deploy keys?%{link_end}" msgstr "" msgid "Add domain" @@ -2058,6 +2058,9 @@ msgstr "" msgid "AdminSettings|Integrations configured here will automatically apply to all projects on this instance." msgstr "" +msgid "AdminSettings|Maximum duration of a session for Git operations when 2FA is enabled." +msgstr "" + msgid "AdminSettings|Moved to integrations" msgstr "" @@ -2082,6 +2085,9 @@ msgstr "" msgid "AdminSettings|Service template allows you to set default values for integrations" msgstr "" +msgid "AdminSettings|Session duration for Git operations when 2FA is enabled (minutes)" +msgstr "" + msgid "AdminSettings|Set an instance-wide auto included %{link_start}pipeline configuration%{link_end}. This pipeline configuration will be run after the project's own configuration." msgstr "" @@ -9273,9 +9279,6 @@ msgstr "" msgid "Decompressed archive size validation failed." msgstr "" -msgid "Default Branch" -msgstr "" - msgid "Default CI configuration path" msgstr "" @@ -9618,6 +9621,9 @@ msgstr "" msgid "Deploy key was successfully updated." msgstr "" +msgid "Deploy keys" +msgstr "" + msgid "Deploy keys grant read/write access to all repositories in your instance" msgstr "" @@ -9696,7 +9702,7 @@ msgstr "" msgid "DeployTokens|Active Deploy Tokens (%{active_tokens})" msgstr "" -msgid "DeployTokens|Add a Deploy Token" +msgid "DeployTokens|Add a deploy token" msgstr "" msgid "DeployTokens|Allows read access to the package registry." @@ -9726,16 +9732,16 @@ msgstr "" msgid "DeployTokens|Created" msgstr "" -msgid "DeployTokens|Deploy Tokens" +msgid "DeployTokens|Deploy tokens" msgstr "" -msgid "DeployTokens|Deploy Tokens allow access to packages, your repository, and registry images." +msgid "DeployTokens|Deploy tokens allow access to packages, your repository, and registry images." msgstr "" msgid "DeployTokens|Expires" msgstr "" -msgid "DeployTokens|Group Deploy Tokens allow access to the packages, repositories, and registry images within the group." +msgid "DeployTokens|Group deploy tokens allow access to the packages, repositories, and registry images within the group." msgstr "" msgid "DeployTokens|Name" @@ -11813,6 +11819,9 @@ msgstr "" msgid "Except policy:" msgstr "" +msgid "Exceptions" +msgstr "" + msgid "Excess storage" msgstr "" @@ -12080,6 +12089,12 @@ msgstr "" msgid "Failed to enqueue the rebase operation, possibly due to a long-lived transaction. Try again later." msgstr "" +msgid "Failed to fetch the iteration for this issue. Please try again." +msgstr "" + +msgid "Failed to fetch the iterations for the group. Please try again." +msgstr "" + msgid "Failed to find import label for Jira import." msgstr "" @@ -19842,6 +19857,9 @@ msgstr "" msgid "No iteration" msgstr "" +msgid "No iterations found" +msgstr "" + msgid "No iterations to show" msgstr "" @@ -20780,6 +20798,12 @@ msgstr "" msgid "Package type must be PyPi" msgstr "" +msgid "PackageRegistry|%{boldStart}Allow duplicates%{boldEnd} - Packages with the same name and version are accepted." +msgstr "" + +msgid "PackageRegistry|%{boldStart}Do not allow duplicates%{boldEnd} - Packages with the same name and version are rejected." +msgstr "" + msgid "PackageRegistry|%{name} version %{version} was first created %{datetime}" msgstr "" @@ -20792,6 +20816,9 @@ msgstr "" msgid "PackageRegistry|Add composer registry" msgstr "" +msgid "PackageRegistry|An error occurred while saving the settings" +msgstr "" + msgid "PackageRegistry|App group: %{group}" msgstr "" @@ -20936,6 +20963,9 @@ msgstr "" msgid "PackageRegistry|Package updated by commit %{link} on branch %{branch}, built by pipeline %{pipeline}, and published to the registry %{datetime}" msgstr "" +msgid "PackageRegistry|Packages can be published if their name or version matches this regex" +msgstr "" + msgid "PackageRegistry|Pip Command" msgstr "" @@ -20954,6 +20984,12 @@ msgstr "" msgid "PackageRegistry|Remove package" msgstr "" +msgid "PackageRegistry|Settings for Maven packages" +msgstr "" + +msgid "PackageRegistry|Settings saved successfully" +msgstr "" + msgid "PackageRegistry|Sorry, your filter produced no results" msgstr "" @@ -21440,9 +21476,6 @@ msgstr "" msgid "Pipelines|Clear Runner Caches" msgstr "" -msgid "Pipelines|Continuous Integration can help catch bugs by running your tests automatically, while Continuous Deployment can help you deliver code to your product environment." -msgstr "" - msgid "Pipelines|Copy trigger token" msgstr "" @@ -23588,9 +23621,6 @@ msgstr "" msgid "Protected Environment" msgstr "" -msgid "Protected Environments" -msgstr "" - msgid "Protected Paths" msgstr "" @@ -23603,6 +23633,9 @@ msgstr "" msgid "Protected branches" msgstr "" +msgid "Protected environments" +msgstr "" + msgid "ProtectedBranch|%{wildcards_link_start}Wildcards%{wildcards_link_end} such as %{code_tag_start}*-stable%{code_tag_end} or %{code_tag_start}production/*%{code_tag_end} are supported." msgstr "" @@ -23831,7 +23864,7 @@ msgstr "" msgid "PushRules|Users can still delete tags through the GitLab UI." msgstr "" -msgid "PushRule|Push Rules" +msgid "PushRule|Push rules" msgstr "" msgid "PushRule|Reject unverified users" @@ -31389,6 +31422,12 @@ msgstr "" msgid "UsageQuota|LFS Storage" msgstr "" +msgid "UsageQuota|Learn more about excess storage usage" +msgstr "" + +msgid "UsageQuota|Learn more about usage quotas" +msgstr "" + msgid "UsageQuota|Packages" msgstr "" diff --git a/package.json b/package.json index 2bc7030a146..209e0e088b1 100644 --- a/package.json +++ b/package.json @@ -163,7 +163,7 @@ }, "devDependencies": { "@babel/plugin-transform-modules-commonjs": "^7.10.1", - "@gitlab/eslint-plugin": "7.0.3", + "@gitlab/eslint-plugin": "8.0.0", "@testing-library/dom": "^7.16.2", "@vue/test-utils": "1.1.2", "acorn": "^6.3.0", @@ -175,8 +175,8 @@ "commander": "^2.18.0", "custom-jquery-matchers": "^2.1.0", "docdash": "^1.0.2", - "eslint": "^6.8.0", - "eslint-import-resolver-jest": "^2.1.1", + "eslint": "7.19.0", + "eslint-import-resolver-jest": "3.0.0", "eslint-import-resolver-webpack": "^0.12.1", "eslint-plugin-jasmine": "^4.1.0", "eslint-plugin-no-jquery": "^2.3.0", diff --git a/scripts/review_apps/automated_cleanup.rb b/scripts/review_apps/automated_cleanup.rb index bef5b7ad5ee..0927481070b 100755 --- a/scripts/review_apps/automated_cleanup.rb +++ b/scripts/review_apps/automated_cleanup.rb @@ -22,7 +22,8 @@ class AutomatedCleanup %w[gitlab gitlab-ee].include?(ENV['CI_PROJECT_NAME']) end - def initialize(project_path: ENV['CI_PROJECT_PATH'], gitlab_token: ENV['GITLAB_BOT_REVIEW_APPS_CLEANUP_TOKEN']) + # $GITLAB_PROJECT_REVIEW_APP_CLEANUP_API_TOKEN => `Automated Review App Cleanup` project token + def initialize(project_path: ENV['CI_PROJECT_PATH'], gitlab_token: ENV['GITLAB_PROJECT_REVIEW_APP_CLEANUP_API_TOKEN']) @project_path = project_path @gitlab_token = gitlab_token end diff --git a/spec/controllers/projects/pipelines_controller_spec.rb b/spec/controllers/projects/pipelines_controller_spec.rb index be4a1504fc9..e1405660ccb 100644 --- a/spec/controllers/projects/pipelines_controller_spec.rb +++ b/spec/controllers/projects/pipelines_controller_spec.rb @@ -272,72 +272,6 @@ RSpec.describe Projects::PipelinesController do end end - describe 'GET #index' do - subject(:request) { get :index, params: { namespace_id: project.namespace, project_id: project } } - - context 'experiment not active' do - it 'does not push tracking_data to gon' do - request - - expect(Gon.tracking_data).to be_nil - end - - it 'does not record experiment_user' do - expect { request }.not_to change(ExperimentUser, :count) - end - end - - context 'when experiment active' do - before do - stub_experiment(pipelines_empty_state: true) - stub_experiment_for_subject(pipelines_empty_state: true) - end - - it 'pushes tracking_data to Gon' do - request - - expect(Gon.experiments["pipelinesEmptyState"]).to eq(true) - expect(Gon.tracking_data).to match( - { - category: 'Growth::Activation::Experiment::PipelinesEmptyState', - action: 'view', - label: anything, - property: 'experimental_group', - value: anything - } - ) - end - - context 'no pipelines created an no CI set up' do - before do - stub_application_setting(auto_devops_enabled: false) - end - - it 'records experiment_user' do - expect { request }.to change(ExperimentUser, :count).by(1) - end - end - - context 'CI set up' do - it 'does not record experiment_user' do - expect { request }.not_to change(ExperimentUser, :count) - end - end - - context 'pipelines created' do - let!(:pipeline) { create(:ci_pipeline, project: project) } - - before do - stub_application_setting(auto_devops_enabled: false) - end - - it 'does not record experiment_user' do - expect { request }.not_to change(ExperimentUser, :count) - end - end - end - end - describe 'GET show.json' do let(:pipeline) { create(:ci_pipeline, project: project) } diff --git a/spec/factories/services_data.rb b/spec/factories/services_data.rb index c62fff2af55..7b6a705c791 100644 --- a/spec/factories/services_data.rb +++ b/spec/factories/services_data.rb @@ -1,6 +1,7 @@ # frozen_string_literal: true -# these factories should never be called directly, they are used when creating services +# These factories should not be called directly unless we are testing a _tracker_data model. +# The factories are used when creating integrations. FactoryBot.define do factory :jira_tracker_data do service diff --git a/spec/features/groups/settings/packages_and_registries_spec.rb b/spec/features/groups/settings/packages_and_registries_spec.rb index 09b0707492f..d53b7603058 100644 --- a/spec/features/groups/settings/packages_and_registries_spec.rb +++ b/spec/features/groups/settings/packages_and_registries_spec.rb @@ -54,6 +54,37 @@ RSpec.describe 'Group Packages & Registries settings' do expect(page).to have_content('Package Registry') expect(page).to have_button('Collapse') end + + it 'automatically saves changes to the server', :js do + visit_settings_page + + expect(page).to have_content('Allow duplicates') + + find('.gl-toggle').click + + expect(page).to have_content('Do not allow duplicates') + + visit_settings_page + + expect(page).to have_content('Do not allow duplicates') + end + + it 'shows an error on wrong regex', :js do + visit_settings_page + + expect(page).to have_content('Allow duplicates') + + find('.gl-toggle').click + + expect(page).to have_content('Do not allow duplicates') + + fill_in 'Exceptions', with: ')' + + # simulate blur event + find('body').click + + expect(page).to have_content('is an invalid regexp') + end end def find_settings_menu diff --git a/spec/features/merge_request/user_edits_mr_spec.rb b/spec/features/merge_request/user_edits_mr_spec.rb index 817b4e0b48e..2c949ed84f4 100644 --- a/spec/features/merge_request/user_edits_mr_spec.rb +++ b/spec/features/merge_request/user_edits_mr_spec.rb @@ -20,14 +20,4 @@ RSpec.describe 'Merge request > User edits MR' do include_context 'merge request edit context' it_behaves_like 'an editable merge request' end - - context 'when merge_request_reviewers is turned off' do - before do - stub_feature_flags(merge_request_reviewers: false) - end - - it 'does not render reviewers dropdown' do - expect(page).not_to have_selector('.js-reviewer-search') - end - end end diff --git a/spec/features/merge_request/user_views_open_merge_request_spec.rb b/spec/features/merge_request/user_views_open_merge_request_spec.rb index fdf29d32836..9bda48a3ec5 100644 --- a/spec/features/merge_request/user_views_open_merge_request_spec.rb +++ b/spec/features/merge_request/user_views_open_merge_request_spec.rb @@ -30,19 +30,6 @@ RSpec.describe 'User views an open merge request' do end end - context 'when merge_request_reviewers is turned off' do - let(:project) { create(:project, :public, :repository) } - - before do - stub_feature_flags(merge_request_reviewers: false) - visit(merge_request_path(merge_request)) - end - - it 'has reviewers in sidebar' do - expect(page).not_to have_css('.reviewer') - end - end - context 'when a merge request has repository', :js do let(:project) { create(:project, :public, :repository) } diff --git a/spec/features/merge_requests/user_lists_merge_requests_spec.rb b/spec/features/merge_requests/user_lists_merge_requests_spec.rb index 36d28ae2822..6b8dcd7dbb6 100644 --- a/spec/features/merge_requests/user_lists_merge_requests_spec.rb +++ b/spec/features/merge_requests/user_lists_merge_requests_spec.rb @@ -40,9 +40,8 @@ RSpec.describe 'Merge requests > User lists merge requests' do updated_at: 10.seconds.ago) end - context 'when merge_request_reviewers is turned on' do + context 'merge request reviewers' do before do - stub_feature_flags(merge_request_reviewers: true) visit_merge_requests(project, reviewer_id: user.id) end @@ -62,15 +61,6 @@ RSpec.describe 'Merge requests > User lists merge requests' do end end - context 'when merge_request_reviewers is turned false' do - it 'has no reviewers in MR list' do - stub_feature_flags(merge_request_reviewers: false) - visit_merge_requests(project, reviewer_id: user.id) - - expect(page).not_to have_css('.issuable-reviewers') - end - end - it 'filters on no assignee' do visit_merge_requests(project, assignee_id: IssuableFinder::Params::FILTER_NONE) diff --git a/spec/frontend/notes/stores/actions_spec.js b/spec/frontend/notes/stores/actions_spec.js index 468e5af6f1a..e2a7a16dbf2 100644 --- a/spec/frontend/notes/stores/actions_spec.js +++ b/spec/frontend/notes/stores/actions_spec.js @@ -1312,6 +1312,7 @@ describe('Actions Notes Store', () => { return actions .updateConfidentialityOnIssuable({ commit: commitSpy, state, getters }, actionArgs) .then(() => { + expect(Flash).not.toHaveBeenCalled(); expect(commitSpy).toHaveBeenCalledWith( mutationTypes.SET_ISSUE_CONFIDENTIAL, confidential, @@ -1319,6 +1320,22 @@ describe('Actions Notes Store', () => { }); }); }); + + describe('on user recoverable error', () => { + it('sends the error to Flash', () => { + const error = 'error'; + + jest + .spyOn(utils.gqClient, 'mutate') + .mockResolvedValue({ data: { issueSetConfidential: { errors: [error] } } }); + + return actions + .updateConfidentialityOnIssuable({ commit: () => {}, state, getters }, actionArgs) + .then(() => { + expect(Flash).toHaveBeenCalledWith(error, 'alert'); + }); + }); + }); }); describe.each` diff --git a/spec/frontend/packages_and_registries/settings/group/components/group_settings_app_spec.js b/spec/frontend/packages_and_registries/settings/group/components/group_settings_app_spec.js index 8a1d5044106..b77dd6c057d 100644 --- a/spec/frontend/packages_and_registries/settings/group/components/group_settings_app_spec.js +++ b/spec/frontend/packages_and_registries/settings/group/components/group_settings_app_spec.js @@ -2,16 +2,28 @@ import { shallowMount, createLocalVue } from '@vue/test-utils'; import { GlSprintf, GlLink } from '@gitlab/ui'; import VueApollo from 'vue-apollo'; import createMockApollo from 'helpers/mock_apollo_helper'; -import component from '~/packages_and_registries/settings/group/components/group_settings_app.vue'; +import waitForPromises from 'helpers/wait_for_promises'; +import createFlash from '~/flash'; import SettingsBlock from '~/vue_shared/components/settings/settings_block.vue'; +import component from '~/packages_and_registries/settings/group/components/group_settings_app.vue'; +import MavenSettings from '~/packages_and_registries/settings/group/components/maven_settings.vue'; import { PACKAGE_SETTINGS_HEADER, PACKAGE_SETTINGS_DESCRIPTION, PACKAGES_DOCS_PATH, + ERROR_UPDATING_SETTINGS, + SUCCESS_UPDATING_SETTINGS, } from '~/packages_and_registries/settings/group/constants'; import getGroupPackagesSettingsQuery from '~/packages_and_registries/settings/group/graphql/queries/get_group_packages_settings.query.graphql'; -import { groupPackageSettingsMock } from '../mock_data'; +import updateNamespacePackageSettings from '~/packages_and_registries/settings/group/graphql/mutations/update_group_packages_settings.mutation.graphql'; +import { + groupPackageSettingsMock, + groupPackageSettingsMutationMock, + groupPackageSettingsMutationErrorMock, +} from '../mock_data'; + +jest.mock('~/flash'); const localVue = createLocalVue(); @@ -27,10 +39,14 @@ describe('Group Settings App', () => { const mountComponent = ({ provide = defaultProvide, resolver = jest.fn().mockResolvedValue(groupPackageSettingsMock), + mutationResolver = jest.fn().mockResolvedValue(groupPackageSettingsMutationMock()), } = {}) => { localVue.use(VueApollo); - const requestHandlers = [[getGroupPackagesSettingsQuery, resolver]]; + const requestHandlers = [ + [getGroupPackagesSettingsQuery, resolver], + [updateNamespacePackageSettings, mutationResolver], + ]; apolloProvider = createMockApollo(requestHandlers); @@ -53,6 +69,19 @@ describe('Group Settings App', () => { const findSettingsBlock = () => wrapper.find(SettingsBlock); const findDescription = () => wrapper.find('[data-testid="description"'); const findLink = () => wrapper.find(GlLink); + const findMavenSettings = () => wrapper.find(MavenSettings); + + const waitForApolloQueryAndRender = async () => { + await waitForPromises(); + await wrapper.vm.$nextTick(); + }; + + const emitSettingsUpdate = (override) => { + findMavenSettings().vm.$emit('update', { + mavenDuplicateExceptionRegex: ')', + ...override, + }); + }; it('renders a settings block', () => { mountComponent(); @@ -96,4 +125,157 @@ describe('Group Settings App', () => { fullPath: defaultProvide.groupPath, }); }); + + describe('maven settings', () => { + it('exists', () => { + mountComponent(); + + expect(findMavenSettings().exists()).toBe(true); + }); + + it('assigns duplication allowness and exception props', async () => { + mountComponent(); + + expect(findMavenSettings().props('loading')).toBe(true); + + await waitForApolloQueryAndRender(); + + const { + mavenDuplicatesAllowed, + mavenDuplicateExceptionRegex, + } = groupPackageSettingsMock.data.group.packageSettings; + + expect(findMavenSettings().props()).toMatchObject({ + mavenDuplicatesAllowed, + mavenDuplicateExceptionRegex, + mavenDuplicateExceptionRegexError: '', + loading: false, + }); + }); + + it('on update event calls the mutation', async () => { + const mutationResolver = jest.fn().mockResolvedValue(groupPackageSettingsMutationMock()); + mountComponent({ mutationResolver }); + + await waitForApolloQueryAndRender(); + + emitSettingsUpdate(); + + expect(mutationResolver).toHaveBeenCalledWith({ + input: { mavenDuplicateExceptionRegex: ')', namespacePath: 'foo_group_path' }, + }); + }); + }); + + describe('settings update', () => { + describe('success state', () => { + it('shows a success alert', async () => { + mountComponent(); + + await waitForApolloQueryAndRender(); + + emitSettingsUpdate(); + + await waitForPromises(); + + expect(createFlash).toHaveBeenCalledWith({ + message: SUCCESS_UPDATING_SETTINGS, + type: 'success', + }); + }); + + it('has an optimistic response', async () => { + const mavenDuplicateExceptionRegex = 'latest[master]something'; + mountComponent(); + + await waitForApolloQueryAndRender(); + + expect(findMavenSettings().props('mavenDuplicateExceptionRegex')).toBe(''); + + emitSettingsUpdate({ mavenDuplicateExceptionRegex }); + + // wait for apollo to update the model with the optimistic response + await wrapper.vm.$nextTick(); + + expect(findMavenSettings().props('mavenDuplicateExceptionRegex')).toBe( + mavenDuplicateExceptionRegex, + ); + + // wait for the call to resolve + await waitForPromises(); + + expect(findMavenSettings().props('mavenDuplicateExceptionRegex')).toBe( + mavenDuplicateExceptionRegex, + ); + }); + }); + + describe('errors', () => { + it('mutation payload with root level errors', async () => { + // note this is a complex test that covers all the path around errors that are shown in the form + // it's one single it case, due to the expensive preparation and execution + const mutationResolver = jest.fn().mockResolvedValue(groupPackageSettingsMutationErrorMock); + mountComponent({ mutationResolver }); + + await waitForApolloQueryAndRender(); + + emitSettingsUpdate(); + + await waitForApolloQueryAndRender(); + + // errors are bound to the component + expect(findMavenSettings().props('mavenDuplicateExceptionRegexError')).toBe( + groupPackageSettingsMutationErrorMock.errors[0].extensions.problems[0].message, + ); + + // general error message is shown + expect(createFlash).toHaveBeenCalledWith({ + message: ERROR_UPDATING_SETTINGS, + type: 'warning', + }); + + emitSettingsUpdate(); + + await wrapper.vm.$nextTick(); + + // errors are reset on mutation call + expect(findMavenSettings().props('mavenDuplicateExceptionRegexError')).toBe(''); + }); + + it('mutation payload with local errors', async () => { + const mutationResolver = jest + .fn() + .mockResolvedValue(groupPackageSettingsMutationMock({ errors: ['foo'] })); + + mountComponent({ mutationResolver }); + + await waitForApolloQueryAndRender(); + + emitSettingsUpdate(); + + await waitForPromises(); + + expect(createFlash).toHaveBeenCalledWith({ + message: ERROR_UPDATING_SETTINGS, + type: 'warning', + }); + }); + + it('shows an error in case of network error', async () => { + const mutationResolver = jest.fn().mockRejectedValue(); + mountComponent({ mutationResolver }); + + await waitForApolloQueryAndRender(); + + emitSettingsUpdate(); + + await waitForPromises(); + + expect(createFlash).toHaveBeenCalledWith({ + message: ERROR_UPDATING_SETTINGS, + type: 'warning', + }); + }); + }); + }); }); diff --git a/spec/frontend/packages_and_registries/settings/group/components/maven_settings_spec.js b/spec/frontend/packages_and_registries/settings/group/components/maven_settings_spec.js new file mode 100644 index 00000000000..e101b9a58f6 --- /dev/null +++ b/spec/frontend/packages_and_registries/settings/group/components/maven_settings_spec.js @@ -0,0 +1,153 @@ +import { shallowMount } from '@vue/test-utils'; +import { GlSprintf, GlToggle, GlFormGroup, GlFormInput } from '@gitlab/ui'; +import component from '~/packages_and_registries/settings/group/components/maven_settings.vue'; + +import { + MAVEN_TITLE, + MAVEN_SETTINGS_SUBTITLE, + MAVEN_DUPLICATES_ALLOWED_DISABLED, + MAVEN_DUPLICATES_ALLOWED_ENABLED, + MAVEN_SETTING_EXCEPTION_TITLE, + MAVEN_SETTINGS_EXCEPTION_LEGEND, +} from '~/packages_and_registries/settings/group/constants'; + +describe('Maven Settings', () => { + let wrapper; + + const defaultProps = { + mavenDuplicatesAllowed: false, + mavenDuplicateExceptionRegex: 'foo', + }; + + const mountComponent = (propsData = defaultProps) => { + wrapper = shallowMount(component, { + propsData, + stubs: { + GlSprintf, + }, + }); + }; + + afterEach(() => { + wrapper.destroy(); + wrapper = null; + }); + + const findTitle = () => wrapper.find('h5'); + const findSubTitle = () => wrapper.find('p'); + const findToggle = () => wrapper.find(GlToggle); + const findToggleLabel = () => wrapper.find('[data-testid="toggle-label"'); + + const findInputGroup = () => wrapper.find(GlFormGroup); + const findInput = () => wrapper.find(GlFormInput); + + it('has a title', () => { + mountComponent(); + + expect(findTitle().exists()).toBe(true); + expect(findTitle().text()).toBe(MAVEN_TITLE); + }); + + it('has a subtitle', () => { + mountComponent(); + + expect(findSubTitle().exists()).toBe(true); + expect(findSubTitle().text()).toBe(MAVEN_SETTINGS_SUBTITLE); + }); + + it('has a toggle', () => { + mountComponent(); + + expect(findToggle().exists()).toBe(true); + expect(findToggle().props('value')).toBe(defaultProps.mavenDuplicatesAllowed); + }); + + it('toggle emits an update event', () => { + mountComponent(); + + findToggle().vm.$emit('change', false); + + expect(wrapper.emitted('update')).toEqual([[{ mavenDuplicatesAllowed: false }]]); + }); + + describe('when the duplicates are disabled', () => { + it('the toggle has the disabled message', () => { + mountComponent(); + + expect(findToggleLabel().exists()).toBe(true); + expect(findToggleLabel().text()).toMatchInterpolatedText(MAVEN_DUPLICATES_ALLOWED_DISABLED); + }); + + it('shows a form group with an input field', () => { + mountComponent(); + + expect(findInputGroup().exists()).toBe(true); + + expect(findInputGroup().attributes()).toMatchObject({ + 'label-for': 'maven-duplicated-settings-regex-input', + label: MAVEN_SETTING_EXCEPTION_TITLE, + description: MAVEN_SETTINGS_EXCEPTION_LEGEND, + }); + }); + + it('shows an input field', () => { + mountComponent(); + + expect(findInput().exists()).toBe(true); + + expect(findInput().attributes()).toMatchObject({ + id: 'maven-duplicated-settings-regex-input', + value: defaultProps.mavenDuplicateExceptionRegex, + }); + }); + + it('input change event emits an update event', () => { + mountComponent(); + + findInput().vm.$emit('change', 'bar'); + + expect(wrapper.emitted('update')).toEqual([[{ mavenDuplicateExceptionRegex: 'bar' }]]); + }); + + describe('valid state', () => { + it('form group has correct props', () => { + mountComponent(); + + expect(findInputGroup().attributes()).toMatchObject({ + state: 'true', + 'invalid-feedback': '', + }); + }); + }); + + describe('invalid state', () => { + it('form group has correct props', () => { + const propsWithError = { + ...defaultProps, + mavenDuplicateExceptionRegexError: 'some error string', + }; + + mountComponent(propsWithError); + + expect(findInputGroup().attributes()).toMatchObject({ + 'invalid-feedback': propsWithError.mavenDuplicateExceptionRegexError, + }); + }); + }); + }); + + describe('when the duplicates are enabled', () => { + it('has the correct toggle label', () => { + mountComponent({ ...defaultProps, mavenDuplicatesAllowed: true }); + + expect(findToggleLabel().exists()).toBe(true); + expect(findToggleLabel().text()).toMatchInterpolatedText(MAVEN_DUPLICATES_ALLOWED_ENABLED); + }); + + it('hides the form input group', () => { + mountComponent({ ...defaultProps, mavenDuplicatesAllowed: true }); + + expect(findInputGroup().exists()).toBe(false); + }); + }); +}); diff --git a/spec/frontend/packages_and_registries/settings/group/graphl/utils/cache_update_spec.js b/spec/frontend/packages_and_registries/settings/group/graphl/utils/cache_update_spec.js new file mode 100644 index 00000000000..b9e0fde60f5 --- /dev/null +++ b/spec/frontend/packages_and_registries/settings/group/graphl/utils/cache_update_spec.js @@ -0,0 +1,56 @@ +import { updateGroupPackageSettings } from '~/packages_and_registries/settings/group/graphql/utils/cache_update'; +import expirationPolicyQuery from '~/packages_and_registries/settings/group/graphql/queries/get_group_packages_settings.query.graphql'; + +describe('Package and Registries settings group cache updates', () => { + let client; + + const payload = { + data: { + updateNamespacePackageSettings: { + packageSettings: { + mavenDuplicatesAllowed: false, + mavenDuplicateExceptionRegex: 'latest[master]something', + }, + }, + }, + }; + + const cacheMock = { + group: { + packageSettings: { + mavenDuplicatesAllowed: true, + mavenDuplicateExceptionRegex: '', + }, + }, + }; + + const queryAndVariables = { + query: expirationPolicyQuery, + variables: { fullPath: 'foo' }, + }; + + beforeEach(() => { + client = { + readQuery: jest.fn().mockReturnValue(cacheMock), + writeQuery: jest.fn(), + }; + }); + describe('updateGroupPackageSettings', () => { + it('calls readQuery', () => { + updateGroupPackageSettings('foo')(client, payload); + expect(client.readQuery).toHaveBeenCalledWith(queryAndVariables); + }); + + it('writes the correct result in the cache', () => { + updateGroupPackageSettings('foo')(client, payload); + expect(client.writeQuery).toHaveBeenCalledWith({ + ...queryAndVariables, + data: { + group: { + ...payload.data.updateNamespacePackageSettings, + }, + }, + }); + }); + }); +}); diff --git a/spec/frontend/packages_and_registries/settings/group/graphl/utils/optimistic_responses_spec.js b/spec/frontend/packages_and_registries/settings/group/graphl/utils/optimistic_responses_spec.js new file mode 100644 index 00000000000..a3c53d5768a --- /dev/null +++ b/spec/frontend/packages_and_registries/settings/group/graphl/utils/optimistic_responses_spec.js @@ -0,0 +1,20 @@ +import { updateGroupPackagesSettingsOptimisticResponse } from '~/packages_and_registries/settings/group/graphql/utils/optimistic_responses'; + +describe('Optimistic responses', () => { + describe('updateGroupPackagesSettingsOptimisticResponse', () => { + it('returns the correct structure', () => { + expect(updateGroupPackagesSettingsOptimisticResponse({ foo: 'bar' })).toMatchInlineSnapshot(` + Object { + "__typename": "Mutation", + "updateNamespacePackageSettings": Object { + "__typename": "UpdateNamespacePackageSettingsPayload", + "errors": Array [], + "packageSettings": Object { + "foo": "bar", + }, + }, + } + `); + }); + }); +}); diff --git a/spec/frontend/packages_and_registries/settings/group/mock_data.js b/spec/frontend/packages_and_registries/settings/group/mock_data.js index 6be43cb4aea..777c0898de0 100644 --- a/spec/frontend/packages_and_registries/settings/group/mock_data.js +++ b/spec/frontend/packages_and_registries/settings/group/mock_data.js @@ -4,9 +4,45 @@ export const groupPackageSettingsMock = { packageSettings: { mavenDuplicatesAllowed: true, mavenDuplicateExceptionRegex: '', - __typename: 'PackageSettings', }, - __typename: 'Group', }, }, }; + +export const groupPackageSettingsMutationMock = (override) => ({ + data: { + updateNamespacePackageSettings: { + packageSettings: { + mavenDuplicatesAllowed: true, + mavenDuplicateExceptionRegex: 'latest[master]something', + }, + errors: [], + ...override, + }, + }, +}); + +export const groupPackageSettingsMutationErrorMock = { + errors: [ + { + message: + 'Variable $input of type UpdateNamespacePackageSettingsInput! was provided invalid value for mavenDuplicateExceptionRegex (latest[master]somethingj)) is an invalid regexp: unexpected ): latest[master]somethingj)))', + locations: [{ line: 1, column: 41 }], + extensions: { + value: { + namespacePath: 'gitlab-org', + mavenDuplicateExceptionRegex: 'latest[master]something))', + }, + problems: [ + { + path: ['mavenDuplicateExceptionRegex'], + explanation: + 'latest[master]somethingj)) is an invalid regexp: unexpected ): latest[master]something))', + message: + 'latest[master]somethingj)) is an invalid regexp: unexpected ): latest[master]something))', + }, + ], + }, + }, + ], +}; diff --git a/spec/frontend/pipeline_new/components/pipeline_new_form_spec.js b/spec/frontend/pipeline_new/components/pipeline_new_form_spec.js index 3f1cf67127e..c1eb3ba3b17 100644 --- a/spec/frontend/pipeline_new/components/pipeline_new_form_spec.js +++ b/spec/frontend/pipeline_new/components/pipeline_new_form_spec.js @@ -242,6 +242,9 @@ describe('Pipeline New Form', () => { describe('when yml defines a variable', () => { const mockYmlKey = 'yml_var'; const mockYmlValue = 'yml_var_val'; + const mockYmlMultiLineValue = `A value + with multiple + lines`; const mockYmlDesc = 'A var from yml.'; it('loading icon is shown when content is requested and hidden when received', async () => { @@ -261,6 +264,21 @@ describe('Pipeline New Form', () => { expect(findLoadingIcon().exists()).toBe(false); }); + it('multi-line strings are added to the value field without removing line breaks', async () => { + createComponent('', mockParams, mount); + + mock.onGet(configVariablesPath).reply(httpStatusCodes.OK, { + [mockYmlKey]: { + value: mockYmlMultiLineValue, + description: mockYmlDesc, + }, + }); + + await waitForPromises(); + + expect(findValueInputs().at(0).element.value).toBe(mockYmlMultiLineValue); + }); + describe('with description', () => { beforeEach(async () => { createComponent('', mockParams, mount); diff --git a/spec/frontend/pipelines/empty_state_spec.js b/spec/frontend/pipelines/empty_state_spec.js index 7e42a3b5ae9..3ebedc9ac87 100644 --- a/spec/frontend/pipelines/empty_state_spec.js +++ b/spec/frontend/pipelines/empty_state_spec.js @@ -1,7 +1,5 @@ import { shallowMount } from '@vue/test-utils'; -import { withGonExperiment } from 'helpers/experimentation_helper'; import EmptyState from '~/pipelines/components/pipelines_list/empty_state.vue'; -import Tracking from '~/tracking'; describe('Pipelines Empty State', () => { let wrapper; @@ -40,104 +38,15 @@ describe('Pipelines Empty State', () => { expect(findGetStartedButton().attributes('href')).toBe('foo'); }); - describe('when in control group', () => { - it('should render empty state information', () => { - expect(findInfoText()).toContain( - 'Continuous Integration can help catch bugs by running your tests automatically', - 'while Continuous Deployment can help you deliver code to your product environment', - ); - }); - - it('should render a button', () => { - expect(findGetStartedButton().text()).toBe('Get started with Pipelines'); - }); - }); - - describe('when in experiment group', () => { - withGonExperiment('pipelinesEmptyState'); - - beforeEach(() => { - createWrapper(); - }); - - it('should render empty state information', () => { - expect(findInfoText()).toContain( - 'GitLab CI/CD can automatically build, test, and deploy your code. Let GitLab take care of time', - 'consuming tasks, so you can spend more time creating', - ); - }); - - it('should render button text', () => { - expect(findGetStartedButton().text()).toBe('Get started with CI/CD'); - }); + it('should render empty state information', () => { + expect(findInfoText()).toContain( + 'GitLab CI/CD can automatically build, test, and deploy your code. Let GitLab take care of time', + 'consuming tasks, so you can spend more time creating', + ); }); - describe('tracking', () => { - let origGon; - - describe('when data is set', () => { - beforeEach(() => { - jest.spyOn(Tracking, 'event').mockImplementation(() => {}); - origGon = window.gon; - - window.gon = { - tracking_data: { - category: 'Growth::Activation::Experiment::PipelinesEmptyState', - value: 1, - property: 'experimental_group', - label: 'label', - }, - }; - createWrapper(); - }); - - afterEach(() => { - window.gon = origGon; - }); - - it('tracks when mounted', () => { - expect(Tracking.event).toHaveBeenCalledWith( - 'Growth::Activation::Experiment::PipelinesEmptyState', - 'viewed', - { - value: 1, - label: 'label', - property: 'experimental_group', - }, - ); - }); - - it('tracks when button is clicked', () => { - findGetStartedButton().vm.$emit('click'); - - expect(Tracking.event).toHaveBeenCalledWith( - 'Growth::Activation::Experiment::PipelinesEmptyState', - 'documentation_clicked', - { - value: 1, - label: 'label', - property: 'experimental_group', - }, - ); - }); - }); - - describe('when no data is defined', () => { - beforeEach(() => { - jest.spyOn(Tracking, 'event').mockImplementation(() => {}); - - createWrapper(); - }); - - it('does not track on view', () => { - expect(Tracking.event).not.toHaveBeenCalled(); - }); - - it('does not track when button is clicked', () => { - findGetStartedButton().vm.$emit('click'); - expect(Tracking.event).not.toHaveBeenCalled(); - }); - }); + it('should render button text', () => { + expect(findGetStartedButton().text()).toBe('Get started with CI/CD'); }); }); }); diff --git a/spec/graphql/mutations/design_management/upload_spec.rb b/spec/graphql/mutations/design_management/upload_spec.rb index 326d88cea80..2fdf62c35a2 100644 --- a/spec/graphql/mutations/design_management/upload_spec.rb +++ b/spec/graphql/mutations/design_management/upload_spec.rb @@ -4,6 +4,7 @@ require 'spec_helper' RSpec.describe Mutations::DesignManagement::Upload do include DesignManagementTestHelpers include ConcurrentHelpers + using FixtureFileRefinements let(:issue) { create(:issue) } let(:user) { issue.author } @@ -18,8 +19,12 @@ RSpec.describe Mutations::DesignManagement::Upload do mutation.resolve(project_path: project_path, iid: iid, files: files_to_upload) end + def uploaded_file(filename) + fixture_file_upload(expand_fixture_path(filename)) + end + describe "#resolve" do - let(:files) { [fixture_file_upload('spec/fixtures/dk.png')] } + let(:files) { [uploaded_file('dk.png').to_gitlab_uploaded_file] } subject(:resolve) do mutation.resolve(project_path: project.full_path, iid: issue.iid, files: files) @@ -49,7 +54,7 @@ RSpec.describe Mutations::DesignManagement::Upload do ['dk.png', 'rails_sample.jpg', 'banana_sample.gif'] .cycle .take(Concurrent.processor_count * 2) - .map { |f| RenameableUpload.unique_file(f) } + .map { |f| uploaded_file(f).uniquely_named.to_gitlab_uploaded_file } end def creates_designs diff --git a/spec/helpers/merge_requests_helper_spec.rb b/spec/helpers/merge_requests_helper_spec.rb index 821faaab194..fce4d560b2f 100644 --- a/spec/helpers/merge_requests_helper_spec.rb +++ b/spec/helpers/merge_requests_helper_spec.rb @@ -89,15 +89,5 @@ RSpec.describe MergeRequestsHelper do total: user.assigned_open_merge_requests_count + user.review_requested_open_merge_requests_count ) end - - context 'when merge_request_reviewers is disabled' do - before do - stub_feature_flags(merge_request_reviewers: false) - end - - it 'returns review_requested as 0' do - expect(subject[:review_requested]).to eq(0) - end - end end end diff --git a/spec/lib/api/entities/merge_request_basic_spec.rb b/spec/lib/api/entities/merge_request_basic_spec.rb index fe4c27b70ae..ce2783338f9 100644 --- a/spec/lib/api/entities/merge_request_basic_spec.rb +++ b/spec/lib/api/entities/merge_request_basic_spec.rb @@ -42,29 +42,14 @@ RSpec.describe ::API::Entities::MergeRequestBasic do end context 'reviewers' do - context "when merge_request_reviewers FF is enabled" do - before do - stub_feature_flags(merge_request_reviewers: true) - merge_request.reviewers = [user] - end - - it 'includes assigned reviewers' do - result = Gitlab::Json.parse(present(merge_request).to_json) - - expect(result['reviewers'][0]['username']).to eq user.username - end + before do + merge_request.reviewers = [user] end - context "when merge_request_reviewers FF is disabled" do - before do - stub_feature_flags(merge_request_reviewers: false) - end - - it 'does not include reviewers' do - result = Gitlab::Json.parse(present(merge_request).to_json) + it 'includes assigned reviewers' do + result = Gitlab::Json.parse(present(merge_request).to_json) - expect(result.keys).not_to include('reviewers') - end + expect(result['reviewers'][0]['username']).to eq user.username end end end diff --git a/spec/lib/backup/files_spec.rb b/spec/lib/backup/files_spec.rb index 90cd08ae9cc..92de191da2d 100644 --- a/spec/lib/backup/files_spec.rb +++ b/spec/lib/backup/files_spec.rb @@ -21,10 +21,6 @@ RSpec.describe Backup::Files do allow(File).to receive(:realpath).with("/var/gitlab-pages").and_return("/var/gitlab-pages") allow(File).to receive(:realpath).with("/var/gitlab-pages/..").and_return("/var") - allow_any_instance_of(String).to receive(:color) do |string, _color| - string - end - allow_any_instance_of(described_class).to receive(:progress).and_return(progress) end diff --git a/spec/lib/gitlab/auth/otp/session_enforcer_spec.rb b/spec/lib/gitlab/auth/otp/session_enforcer_spec.rb index 928aade4008..ece2c9bd8d7 100644 --- a/spec/lib/gitlab/auth/otp/session_enforcer_spec.rb +++ b/spec/lib/gitlab/auth/otp/session_enforcer_spec.rb @@ -9,11 +9,12 @@ RSpec.describe Gitlab::Auth::Otp::SessionEnforcer, :clean_gitlab_redis_shared_st it 'registers a session in Redis' do redis = double(:redis) expect(Gitlab::Redis::SharedState).to receive(:with).and_yield(redis) + session_expiry_in_seconds = Gitlab::CurrentSettings.git_two_factor_session_expiry.minutes.to_i expect(redis).to( receive(:setex) .with("#{described_class::OTP_SESSIONS_NAMESPACE}:#{key.id}", - described_class::DEFAULT_EXPIRATION, + session_expiry_in_seconds, true) .once) diff --git a/spec/lib/gitlab/git_access_spec.rb b/spec/lib/gitlab/git_access_spec.rb index a0cafe3d763..07f1fcda3ce 100644 --- a/spec/lib/gitlab/git_access_spec.rb +++ b/spec/lib/gitlab/git_access_spec.rb @@ -411,6 +411,59 @@ RSpec.describe Gitlab::GitAccess do expect { pull_access_check }.not_to raise_error end end + + context 'based on the duration set by the `git_two_factor_session_expiry` setting' do + let_it_be(:git_two_factor_session_expiry) { 20 } + let_it_be(:redis_key_expiry_at) { git_two_factor_session_expiry.minutes.from_now } + + before do + stub_application_setting(git_two_factor_session_expiry: git_two_factor_session_expiry) + end + + def value_of_key + key_expired = Time.current > redis_key_expiry_at + return if key_expired + + true + end + + def stub_redis + redis = double(:redis) + expect(Gitlab::Redis::SharedState).to receive(:with).at_most(:twice).and_yield(redis) + + expect(redis).to( + receive(:get) + .with("#{Gitlab::Auth::Otp::SessionEnforcer::OTP_SESSIONS_NAMESPACE}:#{key.id}")) + .at_most(:twice) + .and_return(value_of_key) + end + + context 'at a time before the stipulated expiry' do + it 'allows push and pull access' do + travel_to(10.minutes.from_now) do + stub_redis + + aggregate_failures do + expect { push_access_check }.not_to raise_error + expect { pull_access_check }.not_to raise_error + end + end + end + end + + context 'at a time after the stipulated expiry' do + it 'does not allow push and pull access' do + travel_to(30.minutes.from_now) do + stub_redis + + aggregate_failures do + expect { push_access_check }.to raise_error + expect { pull_access_check }.to raise_error + end + end + end + end + end end context 'without OTP session' do diff --git a/spec/lib/uploaded_file_spec.rb b/spec/lib/uploaded_file_spec.rb index ececc84bc93..04eef823852 100644 --- a/spec/lib/uploaded_file_spec.rb +++ b/spec/lib/uploaded_file_spec.rb @@ -218,6 +218,20 @@ RSpec.describe UploadedFile do end end + describe '#filename_sanitized?' do + it 'is true when filename has been sanitized' do + file = described_class.new(temp_file.path, filename: 'fooâ‘ .png') + + expect(file).to be_filename_sanitized + end + + it 'is false when filename has not been sanitized' do + file = described_class.new(temp_file.path, filename: 'foo.png') + + expect(file).not_to be_filename_sanitized + end + end + describe '#sanitize_filename' do it { expect(described_class.new(temp_file.path).sanitize_filename('spaced name')).to eq('spaced_name') } it { expect(described_class.new(temp_file.path).sanitize_filename('#$%^&')).to eq('_____') } diff --git a/spec/models/ci/pipeline_artifact_spec.rb b/spec/models/ci/pipeline_artifact_spec.rb index 1ae85b0a5ba..3fe09f05cab 100644 --- a/spec/models/ci/pipeline_artifact_spec.rb +++ b/spec/models/ci/pipeline_artifact_spec.rb @@ -76,8 +76,8 @@ RSpec.describe Ci::PipelineArtifact, type: :model do end end - describe '.has_report?' do - subject(:pipeline_artifact) { Ci::PipelineArtifact.has_report?(file_type) } + describe '.report_exists?' do + subject(:pipeline_artifact) { Ci::PipelineArtifact.report_exists?(file_type) } context 'when file_type is code_coverage' do let(:file_type) { :code_coverage } @@ -173,11 +173,21 @@ RSpec.describe Ci::PipelineArtifact, type: :model do end describe '#present' do - subject { coverage_report.present } + subject(:presenter) { report.present } context 'when file_type is code_coverage' do + let(:report) { coverage_report } + it 'uses code coverage presenter' do - expect(subject.present).to be_kind_of(Ci::PipelineArtifacts::CodeCoveragePresenter) + expect(presenter).to be_kind_of(Ci::PipelineArtifacts::CodeCoveragePresenter) + end + end + + context 'when file_type is code_quality_mr_diff' do + let(:report) { create(:ci_pipeline_artifact, :with_codequality_mr_diff_report) } + + it 'uses code codequality mr diff presenter' do + expect(presenter).to be_kind_of(Ci::PipelineArtifacts::CodeQualityMrDiffPresenter) end end end diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb index 81f045b4db1..969d897e551 100644 --- a/spec/models/issue_spec.rb +++ b/spec/models/issue_spec.rb @@ -1244,9 +1244,7 @@ RSpec.describe Issue do end describe '#allows_reviewers?' do - it 'returns false as issues do not support reviewers feature' do - stub_feature_flags(merge_request_reviewers: true) - + it 'returns false as we do not support reviewers on issues yet' do issue = build_stubbed(:issue) expect(issue.allows_reviewers?).to be(false) diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index aef3aa34425..0ad353d2687 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -4567,17 +4567,7 @@ RSpec.describe MergeRequest, factory_default: :keep do end describe '#allows_reviewers?' do - it 'returns false without merge_request_reviewers feature' do - stub_feature_flags(merge_request_reviewers: false) - - merge_request = build_stubbed(:merge_request) - - expect(merge_request.allows_reviewers?).to be(false) - end - - it 'returns true with merge_request_reviewers feature' do - stub_feature_flags(merge_request_reviewers: true) - + it 'returns true' do merge_request = build_stubbed(:merge_request) expect(merge_request.allows_reviewers?).to be(true) diff --git a/spec/models/project_services/jira_tracker_data_spec.rb b/spec/models/project_services/jira_tracker_data_spec.rb index f2e2fa65e93..46194efcb3d 100644 --- a/spec/models/project_services/jira_tracker_data_spec.rb +++ b/spec/models/project_services/jira_tracker_data_spec.rb @@ -3,13 +3,28 @@ require 'spec_helper' RSpec.describe JiraTrackerData do - let(:service) { build(:jira_service) } - - describe 'Associations' do + describe 'associations' do it { is_expected.to belong_to(:service) } end describe 'deployment_type' do it { is_expected.to define_enum_for(:deployment_type).with_values([:unknown, :server, :cloud]).with_prefix(:deployment) } end + + describe 'proxy settings' do + it { is_expected.to validate_length_of(:proxy_address).is_at_most(2048) } + it { is_expected.to validate_length_of(:proxy_port).is_at_most(5) } + it { is_expected.to validate_length_of(:proxy_username).is_at_most(255) } + it { is_expected.to validate_length_of(:proxy_password).is_at_most(255) } + end + + describe 'encrypted attributes' do + subject { described_class.encrypted_attributes.keys } + + it { + is_expected.to contain_exactly( + :api_url, :password, :proxy_address, :proxy_password, :proxy_port, :proxy_username, :url, :username + ) + } + end end diff --git a/spec/requests/api/graphql/project/merge_request_spec.rb b/spec/requests/api/graphql/project/merge_request_spec.rb index e1b867ad097..a4e8d0bc35e 100644 --- a/spec/requests/api/graphql/project/merge_request_spec.rb +++ b/spec/requests/api/graphql/project/merge_request_spec.rb @@ -66,14 +66,6 @@ RSpec.describe 'getting merge request information nested in a project' do expect(graphql_data_at(:project, :merge_request, :reviewers, :nodes)).to match_array(expected) expect(graphql_data_at(:project, :merge_request, :participants, :nodes)).to include(*expected) end - - it 'suppresses reviewers if reviewers are not allowed' do - stub_feature_flags(merge_request_reviewers: false) - - post_graphql(query, current_user: current_user) - - expect(graphql_data_at(:project, :merge_request, :reviewers)).to be_nil - end end it 'includes diff stats' do diff --git a/spec/requests/api/graphql/project/merge_requests_spec.rb b/spec/requests/api/graphql/project/merge_requests_spec.rb index a11e758c136..d684be91dc9 100644 --- a/spec/requests/api/graphql/project/merge_requests_spec.rb +++ b/spec/requests/api/graphql/project/merge_requests_spec.rb @@ -265,18 +265,6 @@ RSpec.describe 'getting merge request listings nested in a project' do }) end - context 'the feature flag is disabled' do - before do - stub_feature_flags(merge_request_reviewers: false) - end - - it 'does not return reviewers' do - execute_query - - expect(results).to all(match a_hash_including('reviewers' => be_nil)) - end - end - include_examples 'N+1 query check' end end @@ -407,10 +395,12 @@ RSpec.describe 'getting merge request listings nested in a project' do end let(:query) do + # Note: __typename meta field is always requested by the FE graphql_query_for(:project, { full_path: project.full_path }, <<~QUERY - mergeRequests(mergedAfter: "2020-01-01", mergedBefore: "2020-01-05", first: 0) { + mergeRequests(mergedAfter: "2020-01-01", mergedBefore: "2020-01-05", first: 0, sourceBranches: null, labels: null) { count + __typename } QUERY ) diff --git a/spec/serializers/merge_request_basic_entity_spec.rb b/spec/serializers/merge_request_basic_entity_spec.rb index 4a8bcd72d9c..7aa1f47fda5 100644 --- a/spec/serializers/merge_request_basic_entity_spec.rb +++ b/spec/serializers/merge_request_basic_entity_spec.rb @@ -20,23 +20,11 @@ RSpec.describe MergeRequestBasicEntity do let(:params) { { reviewers: [reviewer] } } let(:reviewer) { build(:user) } - context 'when merge_request_reviewers feature is disabled' do - it 'does not contain assignees attributes' do - stub_feature_flags(merge_request_reviewers: false) - - expect(subject[:reviewers]).to be_nil - end - end - - context 'when merge_request_reviewers feature is enabled' do - it 'contains reviewers attributes' do - stub_feature_flags(merge_request_reviewers: true) - - expect(subject[:reviewers].count).to be 1 - expect(subject[:reviewers].first.keys).to include( - :id, :name, :username, :state, :avatar_url, :web_url - ) - end + it 'contains reviewers attributes' do + expect(subject[:reviewers].count).to be 1 + expect(subject[:reviewers].first.keys).to include( + :id, :name, :username, :state, :avatar_url, :web_url + ) end end end diff --git a/spec/serializers/merge_request_sidebar_extras_entity_spec.rb b/spec/serializers/merge_request_sidebar_extras_entity_spec.rb index 74e9956c8a0..58f860097c2 100644 --- a/spec/serializers/merge_request_sidebar_extras_entity_spec.rb +++ b/spec/serializers/merge_request_sidebar_extras_entity_spec.rb @@ -35,23 +35,11 @@ RSpec.describe MergeRequestSidebarExtrasEntity do end describe '#reviewers' do - context 'when merge_request_reviewers feature is disabled' do - it 'does not contain reviewers attributes' do - stub_feature_flags(merge_request_reviewers: false) - - expect(entity[:reviewers]).to be_nil - end - end - - context 'when merge_request_reviewers feature is enabled' do - it 'contains reviewers attributes' do - stub_feature_flags(merge_request_reviewers: true) - - expect(entity[:reviewers].count).to be 1 - expect(entity[:reviewers].first.keys).to include( - :id, :name, :username, :state, :avatar_url, :web_url, :can_merge - ) - end + it 'contains reviewers attributes' do + expect(entity[:reviewers].count).to be 1 + expect(entity[:reviewers].first.keys).to include( + :id, :name, :username, :state, :avatar_url, :web_url, :can_merge + ) end end end diff --git a/spec/services/ci/create_pipeline_service_spec.rb b/spec/services/ci/create_pipeline_service_spec.rb index 2a9d73e75c0..f63ab1bbccd 100644 --- a/spec/services/ci/create_pipeline_service_spec.rb +++ b/spec/services/ci/create_pipeline_service_spec.rb @@ -102,7 +102,6 @@ RSpec.describe Ci::CreatePipelineService do describe 'recording a conversion event' do it 'schedules a record conversion event worker' do expect(Experiments::RecordConversionEventWorker).to receive(:perform_async).with(:ci_syntax_templates, user.id) - expect(Experiments::RecordConversionEventWorker).to receive(:perform_async).with(:pipelines_empty_state, user.id) pipeline end diff --git a/spec/services/design_management/save_designs_service_spec.rb b/spec/services/design_management/save_designs_service_spec.rb index f36e68c8dbd..3e1641e2db2 100644 --- a/spec/services/design_management/save_designs_service_spec.rb +++ b/spec/services/design_management/save_designs_service_spec.rb @@ -4,6 +4,7 @@ require 'spec_helper' RSpec.describe DesignManagement::SaveDesignsService do include DesignManagementTestHelpers include ConcurrentHelpers + using FixtureFileRefinements let_it_be_with_reload(:issue) { create(:issue) } let_it_be(:developer) { create(:user, developer_projects: [issue.project]) } @@ -12,11 +13,11 @@ RSpec.describe DesignManagement::SaveDesignsService do let(:files) { [rails_sample] } let(:design_repository) { ::Gitlab::GlRepository::DESIGN.repository_resolver.call(project) } let(:rails_sample_name) { 'rails_sample.jpg' } - let(:rails_sample) { sample_image(rails_sample_name) } - let(:dk_png) { sample_image('dk.png') } + let(:rails_sample) { uploaded_file(rails_sample_name).to_gitlab_uploaded_file } + let(:dk_png) { uploaded_file('dk.png').to_gitlab_uploaded_file } - def sample_image(filename) - fixture_file_upload("spec/fixtures/#{filename}") + def uploaded_file(filename) + fixture_file_upload(expand_fixture_path(filename)) end def commit_count @@ -122,7 +123,8 @@ RSpec.describe DesignManagement::SaveDesignsService do parellism = 4 blocks = Array.new(parellism).map do - unique_files = [RenameableUpload.unique_file('rails_sample.jpg')] + unique_file = uploaded_file('dk.png').uniquely_named.to_gitlab_uploaded_file + unique_files = [unique_file] -> { run_service(unique_files) } end @@ -306,6 +308,14 @@ RSpec.describe DesignManagement::SaveDesignsService do expect(response[:message]).to match('Duplicate filenames are not allowed!') end end + + context 'when uploading files with special characters in filenames' do + let(:files) { [uploaded_file('dk.png').renamed_as('special_charâ‘ .png').to_gitlab_uploaded_file] } + + it 'returns the correct error' do + expect(response[:message]).to match('Filenames contained invalid characters and could not be saved') + end + end end context 'when the user is not allowed to upload designs' do diff --git a/spec/services/merge_requests/update_service_spec.rb b/spec/services/merge_requests/update_service_spec.rb index c18f7e3754a..a161379b5f1 100644 --- a/spec/services/merge_requests/update_service_spec.rb +++ b/spec/services/merge_requests/update_service_spec.rb @@ -142,44 +142,19 @@ RSpec.describe MergeRequests::UpdateService, :mailer do context 'with reviewers' do let(:opts) { { reviewer_ids: [user2.id] } } - context 'when merge_request_reviewers feature is disabled' do - before do - stub_feature_flags(merge_request_reviewers: false) - end + it 'creates system note about merge_request review request' do + note = find_note('requested review from') - it 'does not create a system note about merge_request review request' do - note = find_note('review requested from') - - expect(note).to be_nil - end - - it 'does not update the tracking' do - expect(Gitlab::UsageDataCounters::MergeRequestActivityUniqueCounter) - .not_to receive(:track_users_review_requested) - - update_merge_request(reviewer_ids: [user.id]) - end + expect(note).not_to be_nil + expect(note.note).to include "requested review from #{user2.to_reference}" end - context 'when merge_request_reviewers feature is enabled' do - before(:context) do - stub_feature_flags(merge_request_reviewers: true) - end - - it 'creates system note about merge_request review request' do - note = find_note('requested review from') - - expect(note).not_to be_nil - expect(note.note).to include "requested review from #{user2.to_reference}" - end - - it 'updates the tracking' do - expect(Gitlab::UsageDataCounters::MergeRequestActivityUniqueCounter) - .to receive(:track_users_review_requested) - .with(users: [user]) + it 'updates the tracking' do + expect(Gitlab::UsageDataCounters::MergeRequestActivityUniqueCounter) + .to receive(:track_users_review_requested) + .with(users: [user]) - update_merge_request(reviewer_ids: [user.id]) - end + update_merge_request(reviewer_ids: [user.id]) end end diff --git a/spec/services/quick_actions/interpret_service_spec.rb b/spec/services/quick_actions/interpret_service_spec.rb index c0452e18f52..1a102b125f6 100644 --- a/spec/services/quick_actions/interpret_service_spec.rb +++ b/spec/services/quick_actions/interpret_service_spec.rb @@ -879,145 +879,123 @@ RSpec.describe QuickActions::InterpretService do let(:issuable) { issue } end - context 'when the merge_request_reviewers flag is enabled' do - describe 'assign_reviewer command' do - let(:content) { "/assign_reviewer @#{developer.username}" } - let(:issuable) { merge_request } + describe 'assign_reviewer command' do + let(:content) { "/assign_reviewer @#{developer.username}" } + let(:issuable) { merge_request } - context 'with one user' do - it_behaves_like 'assign_reviewer command' - end + context 'with one user' do + it_behaves_like 'assign_reviewer command' + end - context 'with an issue instead of a merge request' do - let(:issuable) { issue } + context 'with an issue instead of a merge request' do + let(:issuable) { issue } - it_behaves_like 'empty command' - end + it_behaves_like 'empty command' + end - # CE does not have multiple reviewers - context 'assign command with multiple assignees' do - before do - project.add_developer(developer2) - end + # CE does not have multiple reviewers + context 'assign command with multiple assignees' do + before do + project.add_developer(developer2) + end - # There's no guarantee that the reference extractor will preserve - # the order of the mentioned users since this is dependent on the - # order in which rows are returned. We just ensure that at least - # one of the mentioned users is assigned. - context 'assigns to one of the two users' do - let(:content) { "/assign_reviewer @#{developer.username} @#{developer2.username}" } + # There's no guarantee that the reference extractor will preserve + # the order of the mentioned users since this is dependent on the + # order in which rows are returned. We just ensure that at least + # one of the mentioned users is assigned. + context 'assigns to one of the two users' do + let(:content) { "/assign_reviewer @#{developer.username} @#{developer2.username}" } - it 'assigns to a single reviewer' do - _, updates, message = service.execute(content, issuable) + it 'assigns to a single reviewer' do + _, updates, message = service.execute(content, issuable) - expect(updates[:reviewer_ids].count).to eq(1) - reviewer = updates[:reviewer_ids].first - expect([developer.id, developer2.id]).to include(reviewer) + expect(updates[:reviewer_ids].count).to eq(1) + reviewer = updates[:reviewer_ids].first + expect([developer.id, developer2.id]).to include(reviewer) - user = reviewer == developer.id ? developer : developer2 + user = reviewer == developer.id ? developer : developer2 - expect(message).to match("Assigned #{user.to_reference} as reviewer.") - end + expect(message).to match("Assigned #{user.to_reference} as reviewer.") end end + end - context 'with "me" alias' do - let(:content) { '/assign_reviewer me' } - - it_behaves_like 'assign_reviewer command' - end - - context 'with an alias and whitespace' do - let(:content) { '/assign_reviewer me ' } - - it_behaves_like 'assign_reviewer command' - end - - context 'with an incorrect user' do - let(:content) { '/assign_reviewer @abcd1234' } + context 'with "me" alias' do + let(:content) { '/assign_reviewer me' } - it_behaves_like 'empty command', "Failed to assign a reviewer because no user was found." - end + it_behaves_like 'assign_reviewer command' + end - context 'with the "reviewer" alias' do - let(:content) { "/reviewer @#{developer.username}" } + context 'with an alias and whitespace' do + let(:content) { '/assign_reviewer me ' } - it_behaves_like 'assign_reviewer command' - end + it_behaves_like 'assign_reviewer command' + end - context 'with the "request_review" alias' do - let(:content) { "/request_review @#{developer.username}" } + context 'with an incorrect user' do + let(:content) { '/assign_reviewer @abcd1234' } - it_behaves_like 'assign_reviewer command' - end + it_behaves_like 'empty command', "Failed to assign a reviewer because no user was found." + end - context 'with no user' do - let(:content) { '/assign_reviewer' } + context 'with the "reviewer" alias' do + let(:content) { "/reviewer @#{developer.username}" } - it_behaves_like 'empty command', "Failed to assign a reviewer because no user was found." - end + it_behaves_like 'assign_reviewer command' + end - context 'includes only the user reference with extra text' do - let(:content) { "/assign_reviewer @#{developer.username} do it!" } + context 'with the "request_review" alias' do + let(:content) { "/request_review @#{developer.username}" } - it_behaves_like 'assign_reviewer command' - end + it_behaves_like 'assign_reviewer command' end - describe 'unassign_reviewer command' do - # CE does not have multiple reviewers, so basically anything - # after /unassign_reviewer (including whitespace) will remove - # all the current reviewers. - let(:issuable) { create(:merge_request, reviewers: [developer]) } - let(:content) { "/unassign_reviewer @#{developer.username}" } + context 'with no user' do + let(:content) { '/assign_reviewer' } - context 'with one user' do - it_behaves_like 'unassign_reviewer command' - end + it_behaves_like 'empty command', "Failed to assign a reviewer because no user was found." + end - context 'with an issue instead of a merge request' do - let(:issuable) { issue } + context 'includes only the user reference with extra text' do + let(:content) { "/assign_reviewer @#{developer.username} do it!" } - it_behaves_like 'empty command' - end + it_behaves_like 'assign_reviewer command' + end + end - context 'with anything after the command' do - let(:content) { '/unassign_reviewer supercalifragilisticexpialidocious' } + describe 'unassign_reviewer command' do + # CE does not have multiple reviewers, so basically anything + # after /unassign_reviewer (including whitespace) will remove + # all the current reviewers. + let(:issuable) { create(:merge_request, reviewers: [developer]) } + let(:content) { "/unassign_reviewer @#{developer.username}" } - it_behaves_like 'unassign_reviewer command' - end + context 'with one user' do + it_behaves_like 'unassign_reviewer command' + end - context 'with the "remove_reviewer" alias' do - let(:content) { "/remove_reviewer @#{developer.username}" } + context 'with an issue instead of a merge request' do + let(:issuable) { issue } - it_behaves_like 'unassign_reviewer command' - end + it_behaves_like 'empty command' + end - context 'with no user' do - let(:content) { '/unassign_reviewer' } + context 'with anything after the command' do + let(:content) { '/unassign_reviewer supercalifragilisticexpialidocious' } - it_behaves_like 'unassign_reviewer command' - end + it_behaves_like 'unassign_reviewer command' end - end - context 'when the merge_request_reviewers flag is disabled' do - before do - stub_feature_flags(merge_request_reviewers: false) - end + context 'with the "remove_reviewer" alias' do + let(:content) { "/remove_reviewer @#{developer.username}" } - describe 'assign_reviewer command' do - it_behaves_like 'empty command' do - let(:content) { "/assign_reviewer @#{developer.username}" } - let(:issuable) { merge_request } - end + it_behaves_like 'unassign_reviewer command' end - describe 'unassign_reviewer command' do - it_behaves_like 'empty command' do - let(:content) { "/unassign_reviewer @#{developer.username}" } - let(:issuable) { merge_request } - end + context 'with no user' do + let(:content) { '/unassign_reviewer' } + + it_behaves_like 'unassign_reviewer command' end end diff --git a/spec/support/refinements/fixture_file_refinements.rb b/spec/support/refinements/fixture_file_refinements.rb new file mode 100644 index 00000000000..fd5fcf73200 --- /dev/null +++ b/spec/support/refinements/fixture_file_refinements.rb @@ -0,0 +1,26 @@ +# frozen_string_literal: true + +module FixtureFileRefinements + refine Rack::Test::UploadedFile do + # Recast this instance of `Rack::Test::UploadedFile` to an `::UploadedFile`. + def to_gitlab_uploaded_file + ::UploadedFile.new(path, filename: original_filename, content_type: content_type || 'application/octet-stream').tap do |file| + # `UploadedFile#tempfile` is read-only, so replace this with the writeable fixture file + file.instance_variable_set(:@tempfile, self) + end + end + + # Renames `original_filename` to something guaranteed to be unique. + def uniquely_named + name = File.basename(FactoryBot.generate(:filename), '.*') + extension = File.extname(original_filename) + unique_filename = name + extension + + renamed_as(unique_filename) + end + + def renamed_as(new_filename) + tap { @original_filename = new_filename } + end + end +end diff --git a/spec/support/renameable_upload.rb b/spec/support/renameable_upload.rb deleted file mode 100644 index f7f00181605..00000000000 --- a/spec/support/renameable_upload.rb +++ /dev/null @@ -1,15 +0,0 @@ -# frozen_string_literal: true - -class RenameableUpload < SimpleDelegator - attr_accessor :original_filename - - # Get a fixture file with a new unique name, and the same extension - def self.unique_file(name) - upload = new(fixture_file_upload("spec/fixtures/#{name}")) - ext = File.extname(name) - new_name = File.basename(FactoryBot.generate(:filename), '.*') - upload.original_filename = new_name + ext - - upload - end -end diff --git a/spec/tasks/gitlab/git_rake_spec.rb b/spec/tasks/gitlab/git_rake_spec.rb index 4d89b126c9e..50ec2632d83 100644 --- a/spec/tasks/gitlab/git_rake_spec.rb +++ b/spec/tasks/gitlab/git_rake_spec.rb @@ -9,8 +9,6 @@ RSpec.describe 'gitlab:git rake tasks' do before do Rake.application.rake_require 'tasks/gitlab/git' - allow_any_instance_of(String).to receive(:color) { |string, _color| string } - stub_warn_user_is_not_gitlab end diff --git a/spec/tooling/lib/tooling/kubernetes_client_spec.rb b/spec/tooling/lib/tooling/kubernetes_client_spec.rb index 2511295206c..4a84ec09b5c 100644 --- a/spec/tooling/lib/tooling/kubernetes_client_spec.rb +++ b/spec/tooling/lib/tooling/kubernetes_client_spec.rb @@ -29,7 +29,7 @@ RSpec.describe Tooling::KubernetesClient do specify do expect(Gitlab::Popen).to receive(:popen_with_detail) .with(["kubectl delete #{described_class::RESOURCE_LIST} " + - %(--namespace "#{namespace}" --now --ignore-not-found --include-uninitialized --wait=#{wait} #{release_names_in_command})]) + %(--namespace "#{namespace}" --now --ignore-not-found --wait=#{wait} #{release_names_in_command})]) .and_return(Gitlab::Popen::Result.new([], '', '', double(success?: true))) expect(Gitlab::Popen).to receive(:popen_with_detail) @@ -44,7 +44,7 @@ RSpec.describe Tooling::KubernetesClient do it 'raises an error if the Kubernetes command fails' do expect(Gitlab::Popen).to receive(:popen_with_detail) .with(["kubectl delete #{described_class::RESOURCE_LIST} " + - %(--namespace "#{namespace}" --now --ignore-not-found --include-uninitialized --wait=true -l release="#{release_name}")]) + %(--namespace "#{namespace}" --now --ignore-not-found --wait=true -l release="#{release_name}")]) .and_return(Gitlab::Popen::Result.new([], '', '', double(success?: false))) expect { subject.cleanup_by_release(release_name: release_name) }.to raise_error(described_class::CommandFailedError) @@ -81,7 +81,7 @@ RSpec.describe Tooling::KubernetesClient do specify do expect(Gitlab::Popen).to receive(:popen_with_detail) .with(["kubectl delete #{resource_type} ".squeeze(' ') + - %(--namespace "#{namespace}" --now --ignore-not-found --include-uninitialized --wait=#{wait} #{release_names_in_command})]) + %(--namespace "#{namespace}" --now --ignore-not-found --wait=#{wait} #{release_names_in_command})]) .and_return(Gitlab::Popen::Result.new([], '', '', double(success?: true))) # We're not verifying the output here, just silencing it @@ -92,7 +92,7 @@ RSpec.describe Tooling::KubernetesClient do it 'raises an error if the Kubernetes command fails' do expect(Gitlab::Popen).to receive(:popen_with_detail) .with(["kubectl delete #{resource_type} " + - %(--namespace "#{namespace}" --now --ignore-not-found --include-uninitialized --wait=true #{pod_for_release})]) + %(--namespace "#{namespace}" --now --ignore-not-found --wait=true #{pod_for_release})]) .and_return(Gitlab::Popen::Result.new([], '', '', double(success?: false))) expect { subject.cleanup_by_created_at(resource_type: resource_type, created_before: two_days_ago) }.to raise_error(described_class::CommandFailedError) diff --git a/tooling/lib/tooling/kubernetes_client.rb b/tooling/lib/tooling/kubernetes_client.rb index f7abc5ac4cf..35605fd493c 100644 --- a/tooling/lib/tooling/kubernetes_client.rb +++ b/tooling/lib/tooling/kubernetes_client.rb @@ -43,7 +43,6 @@ module Tooling %(--namespace "#{namespace}"), '--now', '--ignore-not-found', - '--include-uninitialized', %(--wait=#{wait}), selector ] @@ -58,7 +57,6 @@ module Tooling %(--namespace "#{namespace}"), '--now', '--ignore-not-found', - '--include-uninitialized', %(--wait=#{wait}), resource_names.join(' ') ] diff --git a/yarn.lock b/yarn.lock index 10ea634bcd1..5e696dffe47 100644 --- a/yarn.lock +++ b/yarn.lock @@ -840,22 +840,38 @@ exec-sh "^0.3.2" minimist "^1.2.0" +"@eslint/eslintrc@^0.3.0": + version "0.3.0" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.3.0.tgz#d736d6963d7003b6514e6324bec9c602ac340318" + integrity sha512-1JTKgrOKAHVivSvOYw+sJOunkBjUOvjqWk1DPja7ZFhIS2mX/4EgTT8M7eTK9jrKhL/FvXXEbQwIs3pg1xp3dg== + dependencies: + ajv "^6.12.4" + debug "^4.1.1" + espree "^7.3.0" + globals "^12.1.0" + ignore "^4.0.6" + import-fresh "^3.2.1" + js-yaml "^3.13.1" + lodash "^4.17.20" + minimatch "^3.0.4" + strip-json-comments "^3.1.1" + "@gitlab/at.js@1.5.7": version "1.5.7" resolved "https://registry.yarnpkg.com/@gitlab/at.js/-/at.js-1.5.7.tgz#1ee6f838cc4410a1d797770934df91d90df8179e" integrity sha512-c6ySRK/Ma7lxwpIVbSAF3P+xiTLrNTGTLRx4/pHK111AdFxwgUwrYF6aVZFXvmG65jHOJHoa0eQQ21RW6rm0Rg== -"@gitlab/eslint-plugin@7.0.3": - version "7.0.3" - resolved "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-7.0.3.tgz#a5e020dd785cb71624af8f6a2e3b79128b4322b9" - integrity sha512-IVQRfiu/qA80h60HukMbg5wftl6axDCkdcApl4OGIy/wZ+sN33d602pZv5VEc5M7QffJY34c4EHYnQbMZ4nqOw== +"@gitlab/eslint-plugin@8.0.0": + version "8.0.0" + resolved "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-8.0.0.tgz#e8d30fd98e2102f417617d0c60ef1810520a8ac6" + integrity sha512-hTTdcyxN3Ead2FaNwaiPg9sv2YbCDrlyAgKAPV7dit2uPqR0nkIlng9JPNMIixTXBrJ/Y+VvjIRrKKNYBubocw== dependencies: babel-eslint "^10.0.3" - eslint-config-airbnb-base "^14.0.0" + eslint-config-airbnb-base "^14.2.1" eslint-config-prettier "^6.10.0" eslint-plugin-babel "^5.3.0" eslint-plugin-filenames "^1.3.2" - eslint-plugin-import "^2.20.1" + eslint-plugin-import "^2.22.1" eslint-plugin-jest "^23.8.2" eslint-plugin-promise "^4.2.1" eslint-plugin-vue "^7.5.0" @@ -1321,6 +1337,11 @@ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0" integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw== +"@types/json5@^0.0.29": + version "0.0.29" + resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" + integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= + "@types/minimatch@*": version "3.0.3" resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" @@ -1646,7 +1667,7 @@ acorn-globals@^6.0.0: acorn "^7.1.1" acorn-walk "^7.1.1" -acorn-jsx@^5.2.0: +acorn-jsx@^5.2.0, acorn-jsx@^5.3.1: version "5.3.1" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b" integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng== @@ -1666,7 +1687,7 @@ acorn@^6.0.7, acorn@^6.2.1, acorn@^6.3.0: resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.3.0.tgz#0087509119ffa4fc0a0041d1e93a417e68cb856e" integrity sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA== -acorn@^7.1.1: +acorn@^7.1.1, acorn@^7.4.0: version "7.4.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== @@ -1711,6 +1732,16 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4: json-schema-traverse "^0.4.1" uri-js "^4.2.2" +ajv@^7.0.2: + version "7.0.4" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-7.0.4.tgz#827e5f5ae32f5e5c1637db61f253a112229b5e2f" + integrity sha512-xzzzaqgEQfmuhbhAoqjJ8T/1okb6gAzXn/eQRNpAN1AEUoHJTNF9xCDRTtf/s3SKldtZfa+RJeTs+BQq+eZ/sw== + dependencies: + fast-deep-equal "^3.1.1" + json-schema-traverse "^1.0.0" + require-from-string "^2.0.2" + uri-js "^4.2.2" + amdefine@>=0.0.4: version "1.0.1" resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" @@ -1728,6 +1759,11 @@ ansi-colors@^3.0.0: resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf" integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA== +ansi-colors@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" + integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== + ansi-escapes@^4.2.1: version "4.3.0" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.0.tgz#a4ce2b33d6b214b7950d8595c212f12ac9cc569d" @@ -1956,13 +1992,16 @@ array-flatten@^2.1.0: resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.1.tgz#426bb9da84090c1838d812c8150af20a8331e296" integrity sha1-Qmu52oQJDBg42BLIFQryCoMx4pY= -array-includes@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d" - integrity sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0= +array-includes@^3.1.1: + version "3.1.2" + resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.2.tgz#a8db03e0b88c8c6aeddc49cb132f9bcab4ebf9c8" + integrity sha512-w2GspexNQpx+PutG3QpT437/BenZBj0M/MZGn5mzv/MofYqo0xmRHzn4lFsoDlWJ+THYsGJmFlW68WlDFx7VRw== dependencies: - define-properties "^1.1.2" - es-abstract "^1.7.0" + call-bind "^1.0.0" + define-properties "^1.1.3" + es-abstract "^1.18.0-next.1" + get-intrinsic "^1.0.1" + is-string "^1.0.5" array-union@^1.0.1, array-union@^1.0.2: version "1.0.2" @@ -1981,13 +2020,14 @@ array-unique@^0.3.2: resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= -array.prototype.flat@^1.2.1: - version "1.2.3" - resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz#0de82b426b0318dbfdb940089e38b043d37f6c7b" - integrity sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ== +array.prototype.flat@^1.2.3: + version "1.2.4" + resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz#6ef638b43312bd401b4c6199fdec7e2dc9e9a123" + integrity sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg== dependencies: + call-bind "^1.0.0" define-properties "^1.1.3" - es-abstract "^1.17.0-next.1" + es-abstract "^1.18.0-next.1" arraybuffer.slice@~0.0.7: version "0.0.7" @@ -2037,6 +2077,11 @@ astral-regex@^1.0.0: resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9" integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg== +astral-regex@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" + integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== + async-foreach@^0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542" @@ -2645,6 +2690,14 @@ cacheable-request@^6.0.0: normalize-url "^4.1.0" responselike "^1.0.2" +call-bind@^1.0.0, call-bind@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" + integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== + dependencies: + function-bind "^1.1.1" + get-intrinsic "^1.0.2" + call-me-maybe@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b" @@ -2814,11 +2867,6 @@ character-reference-invalid@^1.0.0: resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.2.tgz#21e421ad3d84055952dab4a43a04e73cd425d3ed" integrity sha512-7I/xceXfKyUJmSAn/jw8ve/9DyOP7XxufNYLI9Px7CmsKgEUaZLUTax6nZxGQtaoiZCjpu6cHPj20xC/vqRReQ== -chardet@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" - integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA== - charenc@~0.0.1: version "0.0.2" resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667" @@ -2901,18 +2949,6 @@ cli-boxes@^2.2.0: resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.0.tgz#538ecae8f9c6ca508e3c3c95b453fe93cb4c168d" integrity sha512-gpaBrMAizVEANOpfZp/EEUixTXDyGt7DFzdK5hU+UbWt/J0lB0w20ncZj59Z9a93xHb9u12zF5BS6i9RKbtg4w== -cli-cursor@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307" - integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw== - dependencies: - restore-cursor "^3.1.0" - -cli-width@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639" - integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk= - clipboard@^1.7.1: version "1.7.1" resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-1.7.1.tgz#360d6d6946e99a7a1fef395e42ba92b5e9b5a16b" @@ -3191,10 +3227,10 @@ configstore@^5.0.1: write-file-atomic "^3.0.0" xdg-basedir "^4.0.0" -confusing-browser-globals@^1.0.7: - version "1.0.9" - resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.9.tgz#72bc13b483c0276801681871d4898516f8f54fdd" - integrity sha512-KbS1Y0jMtyPgIxjO7ZzMAuUpAKMt1SzCL9fsrKsX6b0zJPTaT0SiSPmewwVZg9UAO83HVIlEhZF84LIjZ0lmAw== +confusing-browser-globals@^1.0.10: + version "1.0.10" + resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.10.tgz#30d1e7f3d1b882b25ec4933d1d1adac353d20a59" + integrity sha512-gNld/3lySHwuhaVluJUKLePYirM3QNCKzVxqAdhJII9/WXKVX5PURzMVJspS1jTslSqjeuG4KMVTSouit5YPHA== connect-history-api-fallback@^1.6.0: version "1.6.0" @@ -3401,7 +3437,7 @@ cropper@^2.3.0: dependencies: jquery ">= 1.9.1" -cross-spawn@6.0.5, cross-spawn@^6.0.0, cross-spawn@^6.0.5: +cross-spawn@6.0.5, cross-spawn@^6.0.0: version "6.0.5" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== @@ -3420,7 +3456,7 @@ cross-spawn@^3.0.0: lru-cache "^4.0.1" which "^1.2.9" -cross-spawn@^7.0.0: +cross-spawn@^7.0.0, cross-spawn@^7.0.2: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== @@ -3930,7 +3966,7 @@ deep-extend@~0.5.1: resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.5.1.tgz#b894a9dd90d3023fbf1c55a394fb858eb2066f1f" integrity sha512-N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w== -deep-is@~0.1.3: +deep-is@^0.1.3, deep-is@~0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= @@ -3960,7 +3996,7 @@ defer-to-connect@^1.0.1: resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591" integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ== -define-properties@^1.1.2, define-properties@^1.1.3: +define-properties@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== @@ -4410,6 +4446,13 @@ enhanced-resolve@^0.9.1: memory-fs "^0.2.0" tapable "^0.1.8" +enquirer@^2.3.5: + version "2.3.6" + resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" + integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg== + dependencies: + ansi-colors "^4.1.1" + ent@~2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d" @@ -4446,22 +4489,25 @@ error-ex@^1.2.0, error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.12.0, es-abstract@^1.17.0-next.1, es-abstract@^1.7.0: - version "1.17.4" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.4.tgz#e3aedf19706b20e7c2594c35fc0d57605a79e184" - integrity sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ== +es-abstract@^1.18.0-next.1: + version "1.18.0-next.2" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.2.tgz#088101a55f0541f595e7e057199e27ddc8f3a5c2" + integrity sha512-Ih4ZMFHEtZupnUh6497zEL4y2+w8+1ljnCyaTa+adcoafI1GOvMwFlDjBLfWR7y9VLfrjRJe9ocuHY1PSR9jjw== dependencies: + call-bind "^1.0.2" es-to-primitive "^1.2.1" function-bind "^1.1.1" + get-intrinsic "^1.0.2" has "^1.0.3" has-symbols "^1.0.1" - is-callable "^1.1.5" - is-regex "^1.0.5" - object-inspect "^1.7.0" + is-callable "^1.2.2" + is-negative-zero "^2.0.1" + is-regex "^1.1.1" + object-inspect "^1.9.0" object-keys "^1.1.1" - object.assign "^4.1.0" - string.prototype.trimleft "^2.1.1" - string.prototype.trimright "^2.1.1" + object.assign "^4.1.2" + string.prototype.trimend "^1.0.3" + string.prototype.trimstart "^1.0.3" es-to-primitive@^1.2.1: version "1.2.1" @@ -4526,14 +4572,14 @@ escodegen@^1.14.1: optionalDependencies: source-map "~0.6.1" -eslint-config-airbnb-base@^14.0.0: - version "14.0.0" - resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-14.0.0.tgz#8a7bcb9643d13c55df4dd7444f138bf4efa61e17" - integrity sha512-2IDHobw97upExLmsebhtfoD3NAKhV4H0CJWP3Uprd/uk+cHuWYOczPVxQ8PxLFUAw7o3Th1RAU8u1DoUpr+cMA== +eslint-config-airbnb-base@^14.2.1: + version "14.2.1" + resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-14.2.1.tgz#8a2eb38455dc5a312550193b319cdaeef042cd1e" + integrity sha512-GOrQyDtVEc1Xy20U7vsB2yAoB4nBlfH5HZJeatRXHleO+OS5Ot+MWij4Dpltw4/DyIkqUfqz1epfhVR5XWWQPA== dependencies: - confusing-browser-globals "^1.0.7" - object.assign "^4.1.0" - object.entries "^1.1.0" + confusing-browser-globals "^1.0.10" + object.assign "^4.1.2" + object.entries "^1.1.2" eslint-config-prettier@^6.10.0: version "6.10.0" @@ -4542,22 +4588,21 @@ eslint-config-prettier@^6.10.0: dependencies: get-stdin "^6.0.0" -eslint-import-resolver-jest@^2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-jest/-/eslint-import-resolver-jest-2.1.2.tgz#8720fbe8b8498e95cb2bc6ef52b46b713aedaa59" - integrity sha512-gKEHNW02XGzbj6nr6xPwI5bsUgAXFsJZZQwqRJQV8Xw2XJe6pxd1cvo9bCVCwx3xolvmQ4eWcw8Xlf8UICX41A== +eslint-import-resolver-jest@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-jest/-/eslint-import-resolver-jest-3.0.0.tgz#fd61da30fe58f4c1074af1f069b4267c70a91fd6" + integrity sha512-dCrepGDfaI5cK1QeUhUSbrkDalFkFGXyvjsfWyDxg1uPWiwsGpGmK6GFVPS4mn/IAYLipquB9AHonGQP/iaOAQ== dependencies: - find-root "^1.0.0" - micromatch "^3.1.6" - resolve "^1.5.0" + find-root "^1.1.0" + resolve "^1.12.0" -eslint-import-resolver-node@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz#58f15fb839b8d0576ca980413476aab2472db66a" - integrity sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q== +eslint-import-resolver-node@^0.3.4: + version "0.3.4" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717" + integrity sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA== dependencies: debug "^2.6.9" - resolve "^1.5.0" + resolve "^1.13.1" eslint-import-resolver-webpack@^0.12.1: version "0.12.1" @@ -4575,10 +4620,10 @@ eslint-import-resolver-webpack@^0.12.1: resolve "^1.13.1" semver "^5.7.1" -eslint-module-utils@^2.4.1: - version "2.5.2" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.5.2.tgz#7878f7504824e1b857dd2505b59a8e5eda26a708" - integrity sha512-LGScZ/JSlqGKiT8OC+cYRxseMjyqt6QO54nl281CK93unD89ijSeRV6An8Ci/2nvWVKe8K/Tqdm75RQoIOCr+Q== +eslint-module-utils@^2.6.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz#579ebd094f56af7797d19c9866c9c9486629bfa6" + integrity sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA== dependencies: debug "^2.6.9" pkg-dir "^2.0.0" @@ -4600,23 +4645,24 @@ eslint-plugin-filenames@^1.3.2: lodash.snakecase "4.1.1" lodash.upperfirst "4.3.1" -eslint-plugin-import@^2.20.1: - version "2.20.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.1.tgz#802423196dcb11d9ce8435a5fc02a6d3b46939b3" - integrity sha512-qQHgFOTjguR+LnYRoToeZWT62XM55MBVXObHM6SKFd1VzDcX/vqT1kAz8ssqigh5eMj8qXcRoXXGZpPP6RfdCw== +eslint-plugin-import@^2.22.1: + version "2.22.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz#0896c7e6a0cf44109a2d97b95903c2bb689d7702" + integrity sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw== dependencies: - array-includes "^3.0.3" - array.prototype.flat "^1.2.1" + array-includes "^3.1.1" + array.prototype.flat "^1.2.3" contains-path "^0.1.0" debug "^2.6.9" doctrine "1.5.0" - eslint-import-resolver-node "^0.3.2" - eslint-module-utils "^2.4.1" + eslint-import-resolver-node "^0.3.4" + eslint-module-utils "^2.6.0" has "^1.0.3" minimatch "^3.0.4" - object.values "^1.1.0" + object.values "^1.1.1" read-pkg-up "^2.0.0" - resolve "^1.12.0" + resolve "^1.17.0" + tsconfig-paths "^3.9.0" eslint-plugin-jasmine@^4.1.0: version "4.1.0" @@ -4663,21 +4709,14 @@ eslint-scope@^4.0.3: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-scope@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.0.0.tgz#e87c8887c73e8d1ec84f1ca591645c358bfc8fb9" - integrity sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw== +eslint-scope@^5.0.0, eslint-scope@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" + integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== dependencies: - esrecurse "^4.1.0" + esrecurse "^4.3.0" estraverse "^4.1.1" -eslint-utils@^1.4.3: - version "1.4.3" - resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f" - integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q== - dependencies: - eslint-visitor-keys "^1.1.0" - eslint-utils@^2.0.0, eslint-utils@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27" @@ -4685,55 +4724,60 @@ eslint-utils@^2.0.0, eslint-utils@^2.1.0: dependencies: eslint-visitor-keys "^1.1.0" -eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2" - integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A== +eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" + integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== + +eslint-visitor-keys@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8" + integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== -eslint@^6.8.0: - version "6.8.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb" - integrity sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig== +eslint@7.19.0: + version "7.19.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.19.0.tgz#6719621b196b5fad72e43387981314e5d0dc3f41" + integrity sha512-CGlMgJY56JZ9ZSYhJuhow61lMPPjUzWmChFya71Z/jilVos7mR/jPgaEfVGgMBY5DshbKdG8Ezb8FDCHcoMEMg== dependencies: "@babel/code-frame" "^7.0.0" + "@eslint/eslintrc" "^0.3.0" ajv "^6.10.0" - chalk "^2.1.0" - cross-spawn "^6.0.5" + chalk "^4.0.0" + cross-spawn "^7.0.2" debug "^4.0.1" doctrine "^3.0.0" - eslint-scope "^5.0.0" - eslint-utils "^1.4.3" - eslint-visitor-keys "^1.1.0" - espree "^6.1.2" - esquery "^1.0.1" + enquirer "^2.3.5" + eslint-scope "^5.1.1" + eslint-utils "^2.1.0" + eslint-visitor-keys "^2.0.0" + espree "^7.3.1" + esquery "^1.2.0" esutils "^2.0.2" - file-entry-cache "^5.0.1" + file-entry-cache "^6.0.0" functional-red-black-tree "^1.0.1" glob-parent "^5.0.0" globals "^12.1.0" ignore "^4.0.6" import-fresh "^3.0.0" imurmurhash "^0.1.4" - inquirer "^7.0.0" is-glob "^4.0.0" js-yaml "^3.13.1" json-stable-stringify-without-jsonify "^1.0.1" - levn "^0.3.0" - lodash "^4.17.14" + levn "^0.4.1" + lodash "^4.17.20" minimatch "^3.0.4" - mkdirp "^0.5.1" natural-compare "^1.4.0" - optionator "^0.8.3" + optionator "^0.9.1" progress "^2.0.0" - regexpp "^2.0.1" - semver "^6.1.2" - strip-ansi "^5.2.0" - strip-json-comments "^3.0.1" - table "^5.2.3" + regexpp "^3.1.0" + semver "^7.2.1" + strip-ansi "^6.0.0" + strip-json-comments "^3.1.0" + table "^6.0.4" text-table "^0.2.0" v8-compile-cache "^2.0.3" -espree@^6.1.2, espree@^6.2.1: +espree@^6.2.1: version "6.2.1" resolved "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz#77fc72e1fd744a2052c20f38a5b575832e82734a" integrity sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw== @@ -4742,30 +4786,44 @@ espree@^6.1.2, espree@^6.2.1: acorn-jsx "^5.2.0" eslint-visitor-keys "^1.1.0" +espree@^7.3.0, espree@^7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6" + integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g== + dependencies: + acorn "^7.4.0" + acorn-jsx "^5.3.1" + eslint-visitor-keys "^1.3.0" + esprima@^4.0.0, esprima@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== -esquery@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708" - integrity sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA== +esquery@^1.0.1, esquery@^1.2.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57" + integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ== dependencies: - estraverse "^4.0.0" + estraverse "^5.1.0" -esrecurse@^4.1.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf" - integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ== +esrecurse@^4.1.0, esrecurse@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" + integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== dependencies: - estraverse "^4.1.0" + estraverse "^5.2.0" -estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0: +estraverse@^4.1.1, estraverse@^4.2.0: version "4.3.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== +estraverse@^5.1.0, estraverse@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880" + integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ== + esutils@^2.0.2: version "2.0.3" resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" @@ -4952,15 +5010,6 @@ extend@^3.0.0, extend@~3.0.2: resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== -external-editor@^3.0.3: - version "3.1.0" - resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495" - integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew== - dependencies: - chardet "^0.7.0" - iconv-lite "^0.4.24" - tmp "^0.0.33" - extglob@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" @@ -5019,7 +5068,7 @@ fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0: resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== -fast-levenshtein@~2.0.6: +fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= @@ -5062,13 +5111,6 @@ figgy-pudding@^3.5.1: resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790" integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w== -figures@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" - integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg== - dependencies: - escape-string-regexp "^1.0.5" - file-entry-cache@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c" @@ -5076,6 +5118,13 @@ file-entry-cache@^5.0.1: dependencies: flat-cache "^2.0.1" +file-entry-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.0.tgz#7921a89c391c6d93efec2169ac6bf300c527ea0a" + integrity sha512-fqoO76jZ3ZnYrXLDRxBR1YvOvc0k844kcOg40bgsPrE25LAb/PDqTY+ho64Xh2c8ZXgIKldchCFHczG2UVRcWA== + dependencies: + flat-cache "^3.0.4" + file-loader@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-5.1.0.tgz#cb56c070efc0e40666424309bd0d9e45ac6f2bb8" @@ -5158,7 +5207,7 @@ find-cache-dir@^3.0.0, find-cache-dir@^3.3.1: make-dir "^3.0.2" pkg-dir "^4.1.0" -find-root@^1.0.0, find-root@^1.1.0: +find-root@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4" integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng== @@ -5212,11 +5261,24 @@ flat-cache@^2.0.1: rimraf "2.6.3" write "1.0.3" +flat-cache@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" + integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg== + dependencies: + flatted "^3.1.0" + rimraf "^3.0.2" + flatted@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.0.tgz#55122b6536ea496b4b44893ee2608141d10d9916" integrity sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg== +flatted@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469" + integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA== + flush-write-stream@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8" @@ -5381,6 +5443,15 @@ get-caller-file@^2.0.1: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== +get-intrinsic@^1.0.1, get-intrinsic@^1.0.2: + version "1.1.1" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" + integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== + dependencies: + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.1" + get-package-type@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" @@ -5993,7 +6064,7 @@ human-signals@^1.1.1: resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== -iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.24: +iconv-lite@0.4, iconv-lite@0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -6060,10 +6131,10 @@ import-fresh@^2.0.0: caller-path "^2.0.0" resolve-from "^3.0.0" -import-fresh@^3.0.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66" - integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ== +import-fresh@^3.0.0, import-fresh@^3.2.1: + version "3.3.0" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" + integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== dependencies: parent-module "^1.0.0" resolve-from "^4.0.0" @@ -6172,25 +6243,6 @@ ini@^1.3.4, ini@^1.3.5, ini@~1.3.0: resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== -inquirer@^7.0.0: - version "7.0.4" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.0.4.tgz#99af5bde47153abca23f5c7fc30db247f39da703" - integrity sha512-Bu5Td5+j11sCkqfqmUTiwv+tWisMtP0L7Q8WrqA2C/BbBhy1YTdFrvjjlrKq8oagA/tLQBski2Gcx/Sqyi2qSQ== - dependencies: - ansi-escapes "^4.2.1" - chalk "^2.4.2" - cli-cursor "^3.1.0" - cli-width "^2.0.0" - external-editor "^3.0.3" - figures "^3.0.0" - lodash "^4.17.15" - mute-stream "0.0.8" - run-async "^2.2.0" - rxjs "^6.5.3" - string-width "^4.1.0" - strip-ansi "^5.1.0" - through "^2.3.6" - internal-ip@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907" @@ -6295,10 +6347,10 @@ is-buffer@^2.0.0: resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz#4ecf3fcf749cbd1e472689e109ac66261a25e725" integrity sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw== -is-callable@^1.1.4, is-callable@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab" - integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q== +is-callable@^1.1.4, is-callable@^1.2.2: + version "1.2.3" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e" + integrity sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ== is-ci@^2.0.0: version "2.0.0" @@ -6430,6 +6482,11 @@ is-installed-globally@^0.3.1: global-dirs "^2.0.1" is-path-inside "^3.0.1" +is-negative-zero@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24" + integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w== + is-npm@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-4.0.0.tgz#c90dd8380696df87a7a6d823c20d0b12bbe3c84d" @@ -6498,17 +6555,13 @@ is-potential-custom-element-name@^1.0.0: resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397" integrity sha1-DFLlS8yjkbssSUsh6GJtczbG45c= -is-promise@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" - integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o= - -is-regex@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae" - integrity sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ== +is-regex@^1.1.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.2.tgz#81c8ebde4db142f2cf1c53fc86d6a45788266251" + integrity sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg== dependencies: - has "^1.0.3" + call-bind "^1.0.2" + has-symbols "^1.0.1" is-regexp@^2.0.0: version "2.1.0" @@ -6525,6 +6578,11 @@ is-stream@^2.0.0: resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3" integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== +is-string@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6" + integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ== + is-symbol@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38" @@ -7324,6 +7382,11 @@ json-schema-traverse@^0.4.1: resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== +json-schema-traverse@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" + integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== + json-schema@0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" @@ -7581,7 +7644,15 @@ levenary@^1.1.1: dependencies: leven "^3.1.0" -levn@^0.3.0, levn@~0.3.0: +levn@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" + integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ== + dependencies: + prelude-ls "^1.2.1" + type-check "~0.4.0" + +levn@~0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4= @@ -8222,7 +8293,7 @@ methods@~1.1.2: resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= -micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.6: +micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4: version "3.1.10" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== @@ -8522,11 +8593,6 @@ multicast-dns@^6.0.1: dns-packet "^1.0.1" thunky "^0.1.0" -mute-stream@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" - integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== - nan@^2.13.2: version "2.14.1" resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz#d7be34dfa3105b91494c3147089315eff8874b01" @@ -8826,12 +8892,12 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" -object-inspect@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67" - integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw== +object-inspect@^1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz#c90521d74e1127b67266ded3394ad6116986533a" + integrity sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw== -object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1: +object-keys@^1.0.12, object-keys@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== @@ -8843,24 +8909,24 @@ object-visit@^1.0.0: dependencies: isobject "^3.0.0" -object.assign@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da" - integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w== +object.assign@^4.1.0, object.assign@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" + integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ== dependencies: - define-properties "^1.1.2" - function-bind "^1.1.1" - has-symbols "^1.0.0" - object-keys "^1.0.11" + call-bind "^1.0.0" + define-properties "^1.1.3" + has-symbols "^1.0.1" + object-keys "^1.1.1" -object.entries@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.1.tgz#ee1cf04153de02bb093fec33683900f57ce5399b" - integrity sha512-ilqR7BgdyZetJutmDPfXCDffGa0/Yzl2ivVNpbx/g4UeWrCdRnFDUBrKJGLhGieRHDATnyZXWBeCb29k9CJysQ== +object.entries@^1.1.2: + version "1.1.3" + resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.3.tgz#c601c7f168b62374541a07ddbd3e2d5e4f7711a6" + integrity sha512-ym7h7OZebNS96hn5IJeyUmaWhaSM4SVtAPPfNLQEI2MYWCO2egsITb9nab2+i/Pwibx+R0mtn+ltKJXRSeTMGg== dependencies: + call-bind "^1.0.0" define-properties "^1.1.3" - es-abstract "^1.17.0-next.1" - function-bind "^1.1.1" + es-abstract "^1.18.0-next.1" has "^1.0.3" object.pick@^1.3.0: @@ -8870,14 +8936,14 @@ object.pick@^1.3.0: dependencies: isobject "^3.0.1" -object.values@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.0.tgz#bf6810ef5da3e5325790eaaa2be213ea84624da9" - integrity sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg== +object.values@^1.1.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.2.tgz#7a2015e06fcb0f546bd652486ce8583a4731c731" + integrity sha512-MYC0jvJopr8EK6dPBiO8Nb9mvjdypOachO5REGk6MXzujbBrAisKo3HmdEI6kZDL6fC31Mwee/5YbtMebixeag== dependencies: + call-bind "^1.0.0" define-properties "^1.1.3" - es-abstract "^1.12.0" - function-bind "^1.1.1" + es-abstract "^1.18.0-next.1" has "^1.0.3" obuf@^1.0.0, obuf@^1.1.2: @@ -8938,7 +9004,7 @@ optimist@^0.6.1: minimist "~0.0.1" wordwrap "~0.0.2" -optionator@^0.8.1, optionator@^0.8.3: +optionator@^0.8.1: version "0.8.3" resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== @@ -8950,6 +9016,18 @@ optionator@^0.8.1, optionator@^0.8.3: type-check "~0.3.2" word-wrap "~1.2.3" +optionator@^0.9.1: + version "0.9.1" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499" + integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw== + dependencies: + deep-is "^0.1.3" + fast-levenshtein "^2.0.6" + levn "^0.4.1" + prelude-ls "^1.2.1" + type-check "^0.4.0" + word-wrap "^1.2.3" + orderedmap@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/orderedmap/-/orderedmap-1.0.0.tgz#d90fc2ba1ed085190907d601dec6e6a53f8d41ba" @@ -9565,6 +9643,11 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2 source-map "^0.6.1" supports-color "^6.1.0" +prelude-ls@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" + integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== + prelude-ls@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" @@ -10137,10 +10220,10 @@ regex-not@^1.0.0, regex-not@^1.0.2: extend-shallow "^3.0.2" safe-regex "^1.1.0" -regexpp@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f" - integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw== +regexpp@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2" + integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q== regexpu-core@^4.7.0: version "4.7.0" @@ -10318,6 +10401,11 @@ require-directory@^2.1.1: resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= +require-from-string@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" + integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== + require-main-filename@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" @@ -10392,7 +10480,7 @@ resolve-url@^0.2.1: resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= -resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.3.2, resolve@^1.5.0: +resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.3.2: version "1.17.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444" integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w== @@ -10406,14 +10494,6 @@ responselike@^1.0.2: dependencies: lowercase-keys "^1.0.0" -restore-cursor@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e" - integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA== - dependencies: - onetime "^5.1.0" - signal-exit "^3.0.2" - ret@~0.1.10: version "0.1.15" resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" @@ -10466,13 +10546,6 @@ rsvp@^4.8.4: resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.4.tgz#b50e6b34583f3dd89329a2f23a8a2be072845911" integrity sha512-6FomvYPfs+Jy9TfXmBpBuMWNH94SgCsZmJKcanySzgNNP6LjWxBvyLTa9KaMfDDM5oxRfrKDB0r/qeRsLwnBfA== -run-async@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0" - integrity sha1-A3GrSuC91yDUFm19/aZP96RFpsA= - dependencies: - is-promise "^2.1.0" - run-queue@^1.0.0, run-queue@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47" @@ -10485,13 +10558,6 @@ rw@1: resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4" integrity sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q= -rxjs@^6.5.3: - version "6.5.4" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz#e0777fe0d184cec7872df147f303572d414e211c" - integrity sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q== - dependencies: - tslib "^1.9.0" - safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" @@ -10619,12 +10685,14 @@ semver@7.0.0: resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== -semver@7.x, semver@^7.3.2: - version "7.3.2" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938" - integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ== +semver@7.x, semver@^7.2.1, semver@^7.3.2: + version "7.3.4" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97" + integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw== + dependencies: + lru-cache "^6.0.0" -semver@^6.0.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: +semver@^6.0.0, semver@^6.2.0, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== @@ -10801,6 +10869,15 @@ slice-ansi@^2.1.0: astral-regex "^1.0.0" is-fullwidth-code-point "^2.0.0" +slice-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b" + integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ== + dependencies: + ansi-styles "^4.0.0" + astral-regex "^2.0.0" + is-fullwidth-code-point "^3.0.0" + smooshpack@^0.0.62: version "0.0.62" resolved "https://registry.yarnpkg.com/smooshpack/-/smooshpack-0.0.62.tgz#cb31b9f808f73de3146b050f84d044eb353b5503" @@ -11205,21 +11282,21 @@ string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.0" -string.prototype.trimleft@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz#9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74" - integrity sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag== +string.prototype.trimend@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz#a22bd53cca5c7cf44d7c9d5c732118873d6cd18b" + integrity sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw== dependencies: + call-bind "^1.0.0" define-properties "^1.1.3" - function-bind "^1.1.1" -string.prototype.trimright@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz#440314b15996c866ce8a0341894d45186200c5d9" - integrity sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g== +string.prototype.trimstart@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz#9b4cb590e123bb36564401d59824298de50fd5aa" + integrity sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg== dependencies: + call-bind "^1.0.0" define-properties "^1.1.3" - function-bind "^1.1.1" string_decoder@^1.0.0, string_decoder@^1.1.1, string_decoder@~1.1.1: version "1.1.1" @@ -11310,10 +11387,10 @@ strip-indent@^2.0.0: resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68" integrity sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g= -strip-json-comments@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7" - integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw== +strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" + integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== strip-json-comments@~2.0.1: version "2.0.1" @@ -11479,6 +11556,16 @@ table@^5.2.3: slice-ansi "^2.1.0" string-width "^3.0.0" +table@^6.0.4: + version "6.0.7" + resolved "https://registry.yarnpkg.com/table/-/table-6.0.7.tgz#e45897ffbcc1bcf9e8a87bf420f2c9e5a7a52a34" + integrity sha512-rxZevLGTUzWna/qBLObOe16kB2RTnnbhciwgPbMMlazz1yZGVEgnZK762xyVdVznhqxrfCeBMmMkgOOaPwjH7g== + dependencies: + ajv "^7.0.2" + lodash "^4.17.20" + slice-ansi "^4.0.0" + string-width "^4.2.0" + taffydb@2.6.2: version "2.6.2" resolved "https://registry.yarnpkg.com/taffydb/-/taffydb-2.6.2.tgz#7cbcb64b5a141b6a2efc2c5d2c67b4e150b2a268" @@ -11604,11 +11691,6 @@ through2@^2.0.0: readable-stream "~2.3.6" xtend "~4.0.1" -through@^2.3.6: - version "2.3.8" - resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" - integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= - thunky@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/thunky/-/thunky-0.1.0.tgz#bf30146824e2b6e67b0f2d7a4ac8beb26908684e" @@ -11687,7 +11769,7 @@ tiptap@^1.8.0: tiptap-commands "^1.4.0" tiptap-utils "^1.1.1" -tmp@0.0.33, tmp@0.0.x, tmp@^0.0.33: +tmp@0.0.33, tmp@0.0.x: version "0.0.33" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw== @@ -11863,6 +11945,16 @@ ts-jest@26.x: semver "7.x" yargs-parser "20.x" +tsconfig-paths@^3.9.0: + version "3.9.0" + resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b" + integrity sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw== + dependencies: + "@types/json5" "^0.0.29" + json5 "^1.0.1" + minimist "^1.2.0" + strip-bom "^3.0.0" + tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: version "1.13.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043" @@ -11892,6 +11984,13 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0: resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= +type-check@^0.4.0, type-check@~0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" + integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew== + dependencies: + prelude-ls "^1.2.1" + type-check@~0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" @@ -12776,7 +12875,7 @@ widest-line@^3.1.0: dependencies: string-width "^4.0.0" -word-wrap@~1.2.3: +word-wrap@^1.2.3, word-wrap@~1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== |