diff options
85 files changed, 1389 insertions, 236 deletions
diff --git a/.gitlab/ci/package-and-test/main.gitlab-ci.yml b/.gitlab/ci/package-and-test/main.gitlab-ci.yml index 4ebf5d17a27..4c89cbb721b 100644 --- a/.gitlab/ci/package-and-test/main.gitlab-ci.yml +++ b/.gitlab/ci/package-and-test/main.gitlab-ci.yml @@ -42,7 +42,7 @@ stages: .update-script: script: - !reference [.bundle-prefix] - - export QA_COMMAND="$BUNDLE_PREFIX gitlab-qa Test::Omnibus::UpdateFromPrevious $RELEASE $GITLAB_VERSION $UPDATE_TYPE -- $QA_RSPEC_TAGS $RSPEC_REPORT_OPTS" + - export QA_COMMAND="$BUNDLE_PREFIX gitlab-qa Test::Omnibus::UpdateFromPrevious $RELEASE $GITLAB_SEMVER_VERSION $UPDATE_TYPE -- $QA_RSPEC_TAGS $RSPEC_REPORT_OPTS" - echo "Running - '$QA_COMMAND'" - eval "$QA_COMMAND" @@ -408,7 +408,6 @@ update-minor: UPDATE_TYPE: minor QA_RSPEC_TAGS: --tag smoke rules: - - !reference [.rules:test:ee-only, rules] - !reference [.rules:test:update, rules] - if: $QA_SUITES =~ /Test::Instance::Smoke/ - !reference [.rules:test:manual, rules] @@ -421,7 +420,6 @@ update-major: UPDATE_TYPE: major QA_RSPEC_TAGS: --tag smoke rules: - - !reference [.rules:test:ee-only, rules] - !reference [.rules:test:update, rules] - if: $QA_SUITES =~ /Test::Instance::Smoke/ - !reference [.rules:test:manual, rules] diff --git a/.gitlab/ci/package-and-test/rules.gitlab-ci.yml b/.gitlab/ci/package-and-test/rules.gitlab-ci.yml index a371939b536..4e597b042dd 100644 --- a/.gitlab/ci/package-and-test/rules.gitlab-ci.yml +++ b/.gitlab/ci/package-and-test/rules.gitlab-ci.yml @@ -115,18 +115,19 @@ - *qa-run-all-tests - *feature-flags-set-manual -.rules:test:update: +.rules:test:ee-only: rules: - # skip upgrade jobs if gitlab version is not provided - # these jobs need gitlab version because we can't reliably detect it from just the image - - if: $GITLAB_VERSION == null + - if: $FOSS_ONLY == "true" when: never - - !reference [.rules:test:qa, rules] -.rules:test:ee-only: +.rules:test:update: rules: - - if: $FOSS_ONLY == "true" + # skip upgrade jobs if gitlab version is not in semver compatible format + # these jobs need gitlab version because we can't reliably detect it from just the image + - if: $GITLAB_SEMVER_VERSION !~ /^\d+\.\d+\.\d+/ when: never + - !reference [.rules:test:ee-only, rules] + - !reference [.rules:test:qa, rules] # ------------------------------------------ # Report @@ -121,8 +121,8 @@ gem 'grape-swagger', '~>1.5.0', group: [:development, :test] gem 'grape-swagger-entity', '~> 0.5.1', group: [:development, :test] # GraphQL API -gem 'graphql', '~> 1.13', '>= 1.13.19' -gem 'graphiql-rails', '~> 1.9' +gem 'graphql', '~> 1.13.12' +gem 'graphiql-rails', '~> 1.8' gem 'apollo_upload_server', '~> 2.1.0' gem 'graphql-docs', '~> 2.1.0', group: [:development, :test] gem 'graphlient', '~> 0.5.0' # Used by BulkImport feature (group::import) diff --git a/Gemfile.checksum b/Gemfile.checksum index e17946363cb..5b47f54656f 100644 --- a/Gemfile.checksum +++ b/Gemfile.checksum @@ -142,14 +142,14 @@ {"name":"email_spec","version":"2.2.0","platform":"ruby","checksum":"60b7980580a835e7f676db60667f17a2d60e8e0e39c26d81cfc231805c544d79"}, {"name":"encryptor","version":"3.0.0","platform":"ruby","checksum":"abf23f94ab4d864b8cea85b43f3432044a60001982cda7c33c1cd90da8db1969"}, {"name":"erubi","version":"1.12.0","platform":"ruby","checksum":"27bedb74dfb1e04ff60674975e182d8ca787f2224f2e8143268c7696f42e4723"}, -{"name":"escape_utils","version":"1.3.0","platform":"ruby","checksum":"dffb7010922880ace6ceed642156c64e2a64620f27e0849f43bc4f68fd3c2c09"}, +{"name":"escape_utils","version":"1.2.1","platform":"ruby","checksum":"e5292fe8d7e12a9bcb4502d99e28fb602e4e1514690d98a1c4957f6f77b4b162"}, {"name":"et-orbi","version":"1.2.7","platform":"ruby","checksum":"3b693d47f94a4060ccc07e60adda488759b1e8b9228a633ebbad842dfc245fb4"}, {"name":"ethon","version":"0.15.0","platform":"ruby","checksum":"0809805a035bc10f54162ca99f15ded49e428e0488bcfe1c08c821e18261a74d"}, {"name":"excon","version":"0.90.0","platform":"ruby","checksum":"01beac0f20652b12de95aef931f72bcb82ffb009e1c34c42a5cf5df93f4070ae"}, {"name":"execjs","version":"2.8.1","platform":"ruby","checksum":"6d939919cfd81bcc4d6556f322c3995a70cfe4289ea0bd3b1f999b489c323088"}, {"name":"expgen","version":"0.1.1","platform":"ruby","checksum":"4e6a0f65b210a201d6045debb3e62a24e33251a49f81a11b067d303a60d3a239"}, {"name":"expression_parser","version":"0.9.0","platform":"ruby","checksum":"2b56db3cffc48c3337f4f29f5bc2374c86e7ba29acb40269c74bb55af9f868a4"}, -{"name":"extended-markdown-filter","version":"0.7.0","platform":"ruby","checksum":"c8eeef7409fbae18c6b407cd3e4eeb5d25c35cb08fe1ac06f375df3db2d4f138"}, +{"name":"extended-markdown-filter","version":"0.6.0","platform":"ruby","checksum":"46844b5740b1703a0e0674e31a17c83d1244a3198abb3aae51cad1eb152eb19e"}, {"name":"factory_bot","version":"6.2.0","platform":"ruby","checksum":"d181902cdda531cf6cef036001b3a700a7b5e04bac63976864530120b2ac7d13"}, {"name":"factory_bot_rails","version":"6.2.0","platform":"ruby","checksum":"278b969666b078e76e1c972c501da9b1fac15e5b0ff328cc7ce400366164d0a1"}, {"name":"faraday","version":"1.10.0","platform":"ruby","checksum":"a42158d5c1932c16fd483c512f7e0797b4916096bcf0eb5fb927a1c915a7ea02"}, @@ -258,11 +258,11 @@ {"name":"grape-swagger","version":"1.5.0","platform":"ruby","checksum":"9c885b326ab0644abecf7df4ce866abc2411f359cfd59cbcca545b9b3b25c8ff"}, {"name":"grape-swagger-entity","version":"0.5.1","platform":"ruby","checksum":"f51e372d00ac96cf90d948f87b3f4eb287ab053976ca57ad503d442ad8605523"}, {"name":"grape_logging","version":"1.8.4","platform":"ruby","checksum":"efcc3e322dbd5d620a68f078733b7db043cf12680144cd03c982f14115c792d1"}, -{"name":"graphiql-rails","version":"1.9.0","platform":"ruby","checksum":"780ed6f58b118823b1e67a3ac12466c107bd759cb430f302d314a4f6683db67b"}, +{"name":"graphiql-rails","version":"1.8.0","platform":"ruby","checksum":"02e2c5098be2c6c29219a0e9b2910a2cd3c494301587a3199a7c4484d8038ed1"}, {"name":"graphlient","version":"0.5.0","platform":"ruby","checksum":"0f2c9416142e50b6bd4edcd86fe6810f792951732c487f9061aee6d420e0f292"}, {"name":"graphlyte","version":"1.0.0","platform":"ruby","checksum":"b5af4ab67dde6e961f00ea1c18f159f73b52ed11395bb4ece297fe628fa1804d"}, -{"name":"graphql","version":"1.13.19","platform":"ruby","checksum":"43581db30e21f781d3c175e85807071dc0ba94304d59621b44116f817a5f5a5a"}, -{"name":"graphql-client","version":"0.18.0","platform":"ruby","checksum":"98aadc810f23dce5404621903945aa584279574f87855b4301d69c90ddc6250b"}, +{"name":"graphql","version":"1.13.12","platform":"ruby","checksum":"1d82666cf201193a8d0cb54cea38576b820418db4869b549f61a35f3a2d97ac3"}, +{"name":"graphql-client","version":"0.17.0","platform":"ruby","checksum":"5aaf02ce8f2dbc8e3ba05a7eaeb3ad9336762c4424c6093f4438fbb9490eeb5d"}, {"name":"graphql-docs","version":"2.1.0","platform":"ruby","checksum":"7eb82402f8fda455104b2b60364e9ada145d79d3121a8f915790d49da38bb576"}, {"name":"grpc","version":"1.42.0","platform":"ruby","checksum":"b3d2649e67c6a636544996843d9ec191699c54c1aca797dbfea4dff36c14584a"}, {"name":"grpc","version":"1.42.0","platform":"x64-mingw32","checksum":"6aac1b6576134b0a83e000b1269f60d502eb24aee96c64e2658c3f24f8e32ac0"}, @@ -540,7 +540,7 @@ {"name":"safe_yaml","version":"1.0.4","platform":"ruby","checksum":"248193992ef1730a0c9ec579999ef2256a2b3a32a9bd9d708a1e12544a489ec2"}, {"name":"safety_net_attestation","version":"0.4.0","platform":"ruby","checksum":"96be2d74e7ed26453a51894913449bea0e072f44490021545ac2d1c38b0718ce"}, {"name":"sanitize","version":"6.0.0","platform":"ruby","checksum":"81795f985873f3bacee2eaaededeaafc3a29aafeaa9aff51e04b85a66bbf08ff"}, -{"name":"sass","version":"3.7.4","platform":"ruby","checksum":"808b0d39053aa69068df939e24671fe84fd5a9d3314486e1a1457d0934a4255d"}, +{"name":"sass","version":"3.5.5","platform":"ruby","checksum":"1bb5431bc620ce29076728a4c8f7b4acb55066ed9df8cf5d57db6cda450d8080"}, {"name":"sass-listen","version":"4.0.0","platform":"ruby","checksum":"ae9dcb76dd3e234329e5ba6e213f48e532c5a3e7b0b4d8a87f13aaca0cc18377"}, {"name":"sassc","version":"2.4.0","platform":"ruby","checksum":"4c60a2b0a3b36685c83b80d5789401c2f678c1652e3288315a1551d811d9f83e"}, {"name":"sassc","version":"2.4.0","platform":"x64-mingw32","checksum":"8773b917cb52c7e92c94d4bf324c1c0be3e50d9092f9f5ed4c3c6e454b451c5e"}, diff --git a/Gemfile.lock b/Gemfile.lock index 149e8227c26..bf297ea388f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -441,7 +441,7 @@ GEM mail (~> 2.7) encryptor (3.0.0) erubi (1.12.0) - escape_utils (1.3.0) + escape_utils (1.2.1) et-orbi (1.2.7) tzinfo ethon (0.15.0) @@ -451,8 +451,8 @@ GEM expgen (0.1.1) parslet expression_parser (0.9.0) - extended-markdown-filter (0.7.0) - html-pipeline (~> 2.9) + extended-markdown-filter (0.6.0) + html-pipeline (~> 2.0) factory_bot (6.2.0) activesupport (>= 5.0.0) factory_bot_rails (6.2.0) @@ -726,7 +726,7 @@ GEM grape_logging (1.8.4) grape rack - graphiql-rails (1.9.0) + graphiql-rails (1.8.0) railties sprockets-rails graphlient (0.5.0) @@ -734,10 +734,10 @@ GEM faraday_middleware graphql-client graphlyte (1.0.0) - graphql (1.13.19) - graphql-client (0.18.0) + graphql (1.13.12) + graphql-client (0.17.0) activesupport (>= 3.0) - graphql + graphql (~> 1.10) graphql-docs (2.1.0) commonmarker (~> 0.16) escape_utils (~> 1.2) @@ -1355,7 +1355,7 @@ GEM sanitize (6.0.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - sass (3.7.4) + sass (3.5.5) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -1749,10 +1749,10 @@ DEPENDENCIES grape-swagger (~> 1.5.0) grape-swagger-entity (~> 0.5.1) grape_logging (~> 1.8) - graphiql-rails (~> 1.9) + graphiql-rails (~> 1.8) graphlient (~> 0.5.0) graphlyte (~> 1.0.0) - graphql (~> 1.13, >= 1.13.19) + graphql (~> 1.13.12) graphql-docs (~> 2.1.0) grpc (~> 1.42.0) gssapi (~> 1.3.1) diff --git a/app/assets/javascripts/grafana_integration/store/actions.js b/app/assets/javascripts/grafana_integration/store/actions.js index 36a09831c74..76e21f09719 100644 --- a/app/assets/javascripts/grafana_integration/store/actions.js +++ b/app/assets/javascripts/grafana_integration/store/actions.js @@ -29,7 +29,7 @@ export const updateGrafanaIntegration = ({ state, dispatch }) => export const receiveGrafanaIntegrationUpdateSuccess = () => { /** * The operations_controller currently handles successful requests - * by creating a alert banner messsage to notify the user. + * by creating an alert banner message to notify the user. */ refreshCurrentPage(); }; diff --git a/app/assets/javascripts/operation_settings/store/actions.js b/app/assets/javascripts/operation_settings/store/actions.js index 5c870fd5f55..7fa79da59c4 100644 --- a/app/assets/javascripts/operation_settings/store/actions.js +++ b/app/assets/javascripts/operation_settings/store/actions.js @@ -26,7 +26,7 @@ export const saveChanges = ({ state, dispatch }) => export const receiveSaveChangesSuccess = () => { /** * The operations_controller currently handles successful requests - * by creating a alert banner messsage to notify the user. + * by creating an alert banner message to notify the user. */ refreshCurrentPage(); }; diff --git a/app/assets/javascripts/pages/projects/settings/repository/form.js b/app/assets/javascripts/pages/projects/settings/repository/form.js index 380091a3501..f64de693188 100644 --- a/app/assets/javascripts/pages/projects/settings/repository/form.js +++ b/app/assets/javascripts/pages/projects/settings/repository/form.js @@ -10,8 +10,8 @@ import ProtectedTagEditList from '~/protected_tags/protected_tag_edit_list'; import initSettingsPanels from '~/settings_panels'; export default () => { - new ProtectedTagCreate(); - new ProtectedTagEditList(); + new ProtectedTagCreate({ hasLicense: false }); + new ProtectedTagEditList({ hasLicense: false }); initDeployKeys(); initSettingsPanels(); new ProtectedBranchCreate({ hasLicense: false }); diff --git a/app/assets/javascripts/projects/settings/access_dropdown.js b/app/assets/javascripts/projects/settings/access_dropdown.js index 52b8e7e1cd5..71c9e580420 100644 --- a/app/assets/javascripts/projects/settings/access_dropdown.js +++ b/app/assets/javascripts/projects/settings/access_dropdown.js @@ -469,6 +469,14 @@ export default class AccessDropdown { } } + if (this.accessLevel === ACCESS_LEVELS.CREATE && deployKeys.length) { + consolidatedData = consolidatedData.concat( + [{ type: 'divider' }], + [{ type: 'header', content: s__('AccessDropdown|Deploy Keys') }], + deployKeys, + ); + } + return consolidatedData; } @@ -506,7 +514,10 @@ export default class AccessDropdown { break; case LEVEL_TYPES.DEPLOY_KEY: groupRowEl = - this.accessLevel === ACCESS_LEVELS.PUSH ? this.deployKeyRowHtml(item, isActive) : ''; + this.accessLevel === ACCESS_LEVELS.PUSH || this.accessLevel === ACCESS_LEVELS.CREATE + ? this.deployKeyRowHtml(item, isActive) + : ''; + break; case LEVEL_TYPES.GROUP: groupRowEl = this.groupRowHtml(item, isActive); diff --git a/app/assets/javascripts/projects/settings/components/access_dropdown.vue b/app/assets/javascripts/projects/settings/components/access_dropdown.vue index 627914ae2b1..08a1c586f69 100644 --- a/app/assets/javascripts/projects/settings/components/access_dropdown.vue +++ b/app/assets/javascripts/projects/settings/components/access_dropdown.vue @@ -86,7 +86,10 @@ export default { return groupBy(this.preselectedItems, 'type'); }, showDeployKeys() { - return this.accessLevel === ACCESS_LEVELS.PUSH && this.deployKeys.length; + return ( + (this.accessLevel === ACCESS_LEVELS.PUSH || this.accessLevel === ACCESS_LEVELS.CREATE) && + this.deployKeys.length + ); }, toggleLabel() { const counts = Object.entries(this.selected).reduce((acc, [key, value]) => { diff --git a/app/assets/javascripts/projects/settings/constants.js b/app/assets/javascripts/projects/settings/constants.js index 9cf1afd334f..595cbc9c991 100644 --- a/app/assets/javascripts/projects/settings/constants.js +++ b/app/assets/javascripts/projects/settings/constants.js @@ -17,6 +17,7 @@ export const LEVEL_ID_PROP = { export const ACCESS_LEVELS = { MERGE: 'merge_access_levels', PUSH: 'push_access_levels', + CREATE: 'create_access_levels', }; export const ACCESS_LEVEL_NONE = 0; diff --git a/app/assets/javascripts/protected_tags/constants.js b/app/assets/javascripts/protected_tags/constants.js index 3e71ba62877..758b820c4c4 100644 --- a/app/assets/javascripts/protected_tags/constants.js +++ b/app/assets/javascripts/protected_tags/constants.js @@ -1,3 +1,14 @@ import { s__ } from '~/locale'; export const FAILED_TO_UPDATE_TAG_MESSAGE = s__('ProjectSettings|Failed to update tag!'); + +export const ACCESS_LEVELS = { + CREATE: 'create_access_levels', +}; + +export const LEVEL_TYPES = { + ROLE: 'role', + USER: 'user', + GROUP: 'group', + DEPLOY_KEY: 'deploy_key', +}; diff --git a/app/assets/javascripts/protected_tags/protected_tag_create.js b/app/assets/javascripts/protected_tags/protected_tag_create.js index 75fd11cd074..365b9a3b142 100644 --- a/app/assets/javascripts/protected_tags/protected_tag_create.js +++ b/app/assets/javascripts/protected_tags/protected_tag_create.js @@ -1,12 +1,21 @@ import $ from 'jquery'; -import { __ } from '~/locale'; -import CreateItemDropdown from '../create_item_dropdown'; -import ProtectedTagAccessDropdown from './protected_tag_access_dropdown'; +import CreateItemDropdown from '~/create_item_dropdown'; +import { createAlert } from '~/alert'; +import axios from '~/lib/utils/axios_utils'; +import { s__, __ } from '~/locale'; +import AccessDropdown from '~/projects/settings/access_dropdown'; +import { ACCESS_LEVELS, LEVEL_TYPES } from './constants'; export default class ProtectedTagCreate { - constructor() { + constructor({ hasLicense }) { + this.hasLicense = hasLicense; this.$form = $('.js-new-protected-tag'); this.buildDropdowns(); + this.bindEvents(); + } + + bindEvents() { + this.$form.on('submit', this.onFormSubmit.bind(this)); } buildDropdowns() { @@ -16,15 +25,14 @@ export default class ProtectedTagCreate { this.onSelectCallback = this.onSelect.bind(this); // Allowed to Create dropdown - this.protectedTagAccessDropdown = new ProtectedTagAccessDropdown({ + this.protectedTagAccessDropdown = new AccessDropdown({ $dropdown: $allowedToCreateDropdown, - data: gon.create_access_levels, + accessLevelsData: gon.create_access_levels, onSelect: this.onSelectCallback, + accessLevel: ACCESS_LEVELS.CREATE, + hasLicense: this.hasLicense, }); - // Select default - $allowedToCreateDropdown.data('deprecatedJQueryDropdown').selectRowAtIndex(0); - // Protected tag dropdown this.createItemDropdown = new CreateItemDropdown({ $dropdown: this.$form.find('.js-protected-tag-select'), @@ -39,7 +47,7 @@ export default class ProtectedTagCreate { onSelect() { // Enable submit button const $tagInput = this.$form.find('input[name="protected_tag[name]"]'); - const $allowedToCreateInput = this.$form.find('#create_access_levels_attributes'); + const $allowedToCreateInput = this.protectedTagAccessDropdown.getSelectedItems(); this.$form .find('button[type="submit"]') @@ -49,4 +57,57 @@ export default class ProtectedTagCreate { static getProtectedTags(term, callback) { callback(gon.open_tags); } + + getFormData() { + const formData = { + authenticity_token: this.$form.find('input[name="authenticity_token"]').val(), + protected_tag: { + name: this.$form.find('input[name="protected_tag[name]"]').val(), + }, + }; + + Object.keys(ACCESS_LEVELS).forEach((level) => { + const accessLevel = ACCESS_LEVELS[level]; + const selectedItems = this.protectedTagAccessDropdown.getSelectedItems(); + const levelAttributes = []; + + selectedItems.forEach((item) => { + if (item.type === LEVEL_TYPES.USER) { + levelAttributes.push({ + user_id: item.user_id, + }); + } else if (item.type === LEVEL_TYPES.ROLE) { + levelAttributes.push({ + access_level: item.access_level, + }); + } else if (item.type === LEVEL_TYPES.GROUP) { + levelAttributes.push({ + group_id: item.group_id, + }); + } else if (item.type === LEVEL_TYPES.DEPLOY_KEY) { + levelAttributes.push({ + deploy_key_id: item.deploy_key_id, + }); + } + }); + + formData.protected_tag[`${accessLevel}_attributes`] = levelAttributes; + }); + + return formData; + } + + onFormSubmit(e) { + e.preventDefault(); + + axios[this.$form.attr('method')](this.$form.attr('action'), this.getFormData()) + .then(() => { + window.location.reload(); + }) + .catch(() => + createAlert({ + message: s__('ProjectSettings|Failed to protect the tag'), + }), + ); + } } diff --git a/app/assets/javascripts/protected_tags/protected_tag_edit.js b/app/assets/javascripts/protected_tags/protected_tag_edit.js index 392cf00d902..4fa3ac3be4b 100644 --- a/app/assets/javascripts/protected_tags/protected_tag_edit.js +++ b/app/assets/javascripts/protected_tags/protected_tag_edit.js @@ -1,57 +1,115 @@ +import { find } from 'lodash'; import { createAlert } from '~/alert'; -import axios from '../lib/utils/axios_utils'; -import { FAILED_TO_UPDATE_TAG_MESSAGE } from './constants'; -import ProtectedTagAccessDropdown from './protected_tag_access_dropdown'; +import axios from '~/lib/utils/axios_utils'; +import AccessDropdown from '~/projects/settings/access_dropdown'; +import { ACCESS_LEVELS, LEVEL_TYPES, FAILED_TO_UPDATE_TAG_MESSAGE } from './constants'; export default class ProtectedTagEdit { constructor(options) { + this.hasLicense = options.hasLicense; + this.hasChanges = false; this.$wrap = options.$wrap; this.$allowedToCreateDropdownButton = this.$wrap.find('.js-allowed-to-create'); - this.onSelectCallback = this.onSelect.bind(this); + + this.$allowedToCreateDropdownContainer = this.$allowedToCreateDropdownButton.closest( + '.create_access_levels-container', + ); this.buildDropdowns(); } buildDropdowns() { // Allowed to create dropdown - this.protectedTagAccessDropdown = new ProtectedTagAccessDropdown({ + this.protectedTagAccessDropdown = new AccessDropdown({ + accessLevel: ACCESS_LEVELS.CREATE, + accessLevelsData: gon.create_access_levels, $dropdown: this.$allowedToCreateDropdownButton, - data: gon.create_access_levels, - onSelect: this.onSelectCallback, + onSelect: this.onSelectOption.bind(this), + onHide: this.onDropdownHide.bind(this), + hasLicense: this.hasLicense, }); } - onSelect() { - const $allowedToCreateInput = this.$wrap.find( - `input[name="${this.$allowedToCreateDropdownButton.data('fieldName')}"]`, - ); + onSelectOption() { + this.hasChanges = true; + } - // Do not update if one dropdown has not selected any option - if (!$allowedToCreateInput.length) return; + onDropdownHide() { + if (!this.hasChanges) { + return; + } - this.$allowedToCreateDropdownButton.disable(); + this.hasChanges = true; + this.updatePermissions(); + } + + updatePermissions() { + const formData = Object.keys(ACCESS_LEVELS).reduce((acc, level) => { + const accessLevelName = ACCESS_LEVELS[level]; + const inputData = this.protectedTagAccessDropdown.getInputData(accessLevelName); + acc[`${accessLevelName}_attributes`] = inputData; + + return acc; + }, {}); axios .patch(this.$wrap.data('url'), { - protected_tag: { - create_access_levels_attributes: [ - { - id: this.$allowedToCreateDropdownButton.data('accessLevelId'), - access_level: $allowedToCreateInput.val(), - }, - ], - }, + protected_tag: formData, }) - .then(() => { - this.$allowedToCreateDropdownButton.enable(); + .then(({ data }) => { + this.hasChanges = false; + + Object.keys(ACCESS_LEVELS).forEach((level) => { + const accessLevelName = ACCESS_LEVELS[level]; + + // The data coming from server will be the new persisted *state* for each dropdown + this.setSelectedItemsToDropdown(data[accessLevelName], `${accessLevelName}_dropdown`); + }); }) .catch(() => { - this.$allowedToCreateDropdownButton.enable(); - window.scrollTo({ top: 0, behavior: 'smooth' }); createAlert({ message: FAILED_TO_UPDATE_TAG_MESSAGE, }); }); } + + setSelectedItemsToDropdown(items = []) { + const itemsToAdd = items.map((currentItem) => { + if (currentItem.user_id) { + // Do this only for users for now + // get the current data for selected items + const selectedItems = this.protectedTagAccessDropdown.getSelectedItems(); + const currentSelectedItem = find(selectedItems, { + user_id: currentItem.user_id, + }); + + return { + id: currentItem.id, + user_id: currentItem.user_id, + type: LEVEL_TYPES.USER, + persisted: true, + name: currentSelectedItem.name, + username: currentSelectedItem.username, + avatar_url: currentSelectedItem.avatar_url, + }; + } else if (currentItem.group_id) { + return { + id: currentItem.id, + group_id: currentItem.group_id, + type: LEVEL_TYPES.GROUP, + persisted: true, + }; + } + + return { + id: currentItem.id, + access_level: currentItem.access_level, + type: LEVEL_TYPES.ROLE, + persisted: true, + }; + }); + + this.protectedTagAccessDropdown.setSelectedItems(itemsToAdd); + } } diff --git a/app/assets/javascripts/protected_tags/protected_tag_edit_list.js b/app/assets/javascripts/protected_tags/protected_tag_edit_list.js index b35bf4d4606..8ceb970bf03 100644 --- a/app/assets/javascripts/protected_tags/protected_tag_edit_list.js +++ b/app/assets/javascripts/protected_tags/protected_tag_edit_list.js @@ -4,7 +4,8 @@ import $ from 'jquery'; import ProtectedTagEdit from './protected_tag_edit'; export default class ProtectedTagEditList { - constructor() { + constructor(options) { + this.hasLicense = options.hasLicense; this.$wrap = $('.protected-tags-list'); this.initEditForm(); } @@ -13,6 +14,7 @@ export default class ProtectedTagEditList { this.$wrap.find('.js-protected-tag-edit-form').each((i, el) => { new ProtectedTagEdit({ $wrap: $(el), + hasLicense: this.hasLicense, }); }); } diff --git a/app/assets/javascripts/repository/components/fork_info.vue b/app/assets/javascripts/repository/components/fork_info.vue index 51a83e5df8a..1a834ba1d82 100644 --- a/app/assets/javascripts/repository/components/fork_info.vue +++ b/app/assets/javascripts/repository/components/fork_info.vue @@ -1,8 +1,16 @@ <script> -import { GlIcon, GlLink, GlSkeletonLoader, GlSprintf } from '@gitlab/ui'; +import { GlIcon, GlLink, GlSkeletonLoader, GlLoadingIcon, GlSprintf, GlButton } from '@gitlab/ui'; import { s__, sprintf, n__ } from '~/locale'; import { createAlert } from '~/alert'; +import syncForkMutation from '~/repository/mutations/sync_fork.mutation.graphql'; +import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; +import { + POLLING_INTERVAL_DEFAULT, + POLLING_INTERVAL_BACKOFF, + FIVE_MINUTES_IN_MS, +} from '../constants'; import forkDetailsQuery from '../queries/fork_details.query.graphql'; +import ConflictsModal from './fork_sync_conflicts_modal.vue'; export const i18n = { forkedFrom: s__('ForkedFromProjectPath|Forked from'), @@ -12,7 +20,9 @@ export const i18n = { behind: s__('ForksDivergence|%{behindLinkStart}%{behind} %{commit_word} behind%{behindLinkEnd}'), ahead: s__('ForksDivergence|%{aheadLinkStart}%{ahead} %{commit_word} ahead%{aheadLinkEnd} of'), behindAhead: s__('ForksDivergence|%{messages} the upstream repository.'), + limitedVisibility: s__('ForksDivergence|Source project has a limited visibility.'), error: s__('ForksDivergence|Failed to fetch fork details. Try again later.'), + sync: s__('ForksDivergence|Update fork'), }; export default { @@ -20,17 +30,19 @@ export default { components: { GlIcon, GlLink, + GlButton, GlSprintf, GlSkeletonLoader, + ConflictsModal, + GlLoadingIcon, }, + mixins: [glFeatureFlagMixin()], apollo: { project: { query: forkDetailsQuery, + notifyOnNetworkStatusChange: true, variables() { - return { - projectPath: this.projectPath, - ref: this.selectedBranch, - }; + return this.forkDetailsQueryVariables; }, skip() { return !this.sourceName; @@ -42,6 +54,12 @@ export default { error, }); }, + result({ loading }) { + this.handlePolingInterval(loading); + }, + pollInterval() { + return this.pollInterval; + }, }, }, props: { @@ -53,6 +71,11 @@ export default { type: String, required: true, }, + sourceDefaultBranch: { + type: String, + required: false, + default: '', + }, sourceName: { type: String, required: false, @@ -76,18 +99,33 @@ export default { }, data() { return { - project: { - forkDetails: { - ahead: null, - behind: null, - }, - }, + project: {}, + currentPollInterval: null, + isSyncTriggered: false, }; }, computed: { + forkDetailsQueryVariables() { + return { + projectPath: this.projectPath, + ref: this.selectedBranch, + }; + }, + pollInterval() { + return this.isSyncing ? this.currentPollInterval : 0; + }, isLoading() { return this.$apollo.queries.project.loading; }, + forkDetails() { + return this.project?.forkDetails; + }, + hasConflicts() { + return this.forkDetails?.hasConflicts; + }, + isSyncing() { + return this.forkDetails?.isSyncing; + }, ahead() { return this.project?.forkDetails?.ahead; }, @@ -107,7 +145,10 @@ export default { }); }, isUnknownDivergence() { - return (!this.ahead && this.ahead !== 0) || (!this.behind && this.behind !== 0); + return this.sourceName && this.ahead === null && this.behind === null; + }, + isUpToDate() { + return this.ahead === 0 && this.behind === 0; }, behindAheadMessage() { const messages = []; @@ -122,7 +163,16 @@ export default { hasBehindAheadMessage() { return this.behindAheadMessage.length > 0; }, + isSyncButtonAvailable() { + return ( + this.glFeatures.synchronizeFork && + ((this.sourceName && this.forkDetails && this.behind) || this.isUnknownDivergence) + ); + }, forkDivergenceMessage() { + if (!this.forkDetails) { + return this.$options.i18n.limitedVisibility; + } if (this.isUnknownDivergence) { return this.$options.i18n.unknown; } @@ -134,6 +184,73 @@ export default { return this.$options.i18n.upToDate; }, }, + watch: { + hasConflicts(newVal) { + if (newVal && this.isSyncTriggered) { + this.showConflictsModal(); + this.isSyncTriggered = false; + } + }, + }, + methods: { + async syncForkWithPolling() { + await this.$apollo.mutate({ + mutation: syncForkMutation, + variables: { + projectPath: this.projectPath, + targetBranch: this.selectedBranch, + }, + error(error) { + createAlert({ + message: error.message, + captureError: true, + error, + }); + }, + update: (store, { data: { projectSyncFork } }) => { + const { details } = projectSyncFork; + + store.writeQuery({ + query: forkDetailsQuery, + variables: this.forkDetailsQueryVariables, + data: { + project: { + id: this.project.id, + forkDetails: details, + }, + }, + }); + }, + }); + }, + showConflictsModal() { + this.$refs.modal.show(); + }, + startSyncing() { + this.isSyncTriggered = true; + this.syncForkWithPolling(); + }, + checkIfSyncIsPossible() { + if (this.hasConflicts) { + this.showConflictsModal(); + } else { + this.startSyncing(); + } + }, + handlePolingInterval(loading) { + if (!loading && this.isSyncing) { + const backoff = POLLING_INTERVAL_BACKOFF; + const interval = this.currentPollInterval; + const newInterval = Math.min(interval * backoff, FIVE_MINUTES_IN_MS); + this.currentPollInterval = this.currentPollInterval + ? newInterval + : POLLING_INTERVAL_DEFAULT; + } + if (this.currentPollInterval === FIVE_MINUTES_IN_MS) { + this.$apollo.queries.forkDetailsQuery.stopPolling(); + } + }, + }, }; </script> @@ -141,23 +258,45 @@ export default { <div class="info-well gl-sm-display-flex gl-flex-direction-column"> <div class="well-segment gl-p-5 gl-w-full gl-display-flex"> <gl-icon name="fork" :size="16" class="gl-display-block gl-m-4 gl-text-center" /> - <div v-if="sourceName"> - {{ $options.i18n.forkedFrom }} - <gl-link data-qa-selector="forked_from_link" :href="sourcePath">{{ sourceName }}</gl-link> - <gl-skeleton-loader v-if="isLoading" :lines="1" /> - <div v-else class="gl-text-secondary" data-testid="divergence-message"> - <gl-sprintf :message="forkDivergenceMessage"> - <template #aheadLink="{ content }"> - <gl-link :href="aheadComparePath">{{ content }}</gl-link> - </template> - <template #behindLink="{ content }"> - <gl-link :href="behindComparePath">{{ content }}</gl-link> - </template> - </gl-sprintf> + <div + class="gl-display-flex gl-justify-content-space-between gl-align-items-center gl-flex-grow-1" + > + <div v-if="sourceName"> + {{ $options.i18n.forkedFrom }} + <gl-link data-qa-selector="forked_from_link" :href="sourcePath">{{ sourceName }}</gl-link> + <gl-skeleton-loader v-if="isLoading" :lines="1" /> + <div v-else class="gl-text-secondary" data-testid="divergence-message"> + <gl-sprintf :message="forkDivergenceMessage"> + <template #aheadLink="{ content }"> + <gl-link :href="aheadComparePath">{{ content }}</gl-link> + </template> + <template #behindLink="{ content }"> + <gl-link :href="behindComparePath">{{ content }}</gl-link> + </template> + </gl-sprintf> + </div> </div> - </div> - <div v-else data-testid="inaccessible-project" class="gl-align-items-center gl-display-flex"> - {{ $options.i18n.inaccessibleProject }} + <div + v-else + data-testid="inaccessible-project" + class="gl-align-items-center gl-display-flex" + > + {{ $options.i18n.inaccessibleProject }} + </div> + <gl-button + v-if="isSyncButtonAvailable" + :disabled="forkDetails.isSyncing" + @click="checkIfSyncIsPossible" + > + <gl-loading-icon v-if="forkDetails.isSyncing" class="gl-display-inline" size="sm" /> + <span>{{ $options.i18n.sync }}</span> + </gl-button> + <conflicts-modal + ref="modal" + :source-name="sourceName" + :source-path="sourcePath" + :source-default-branch="sourceDefaultBranch" + /> </div> </div> </div> diff --git a/app/assets/javascripts/repository/components/fork_sync_conflicts_modal.vue b/app/assets/javascripts/repository/components/fork_sync_conflicts_modal.vue new file mode 100644 index 00000000000..0bfb90bb3ec --- /dev/null +++ b/app/assets/javascripts/repository/components/fork_sync_conflicts_modal.vue @@ -0,0 +1,137 @@ +<script> +/* eslint-disable @gitlab/require-i18n-strings */ +import { GlModal, GlButton } from '@gitlab/ui'; +import { __, s__ } from '~/locale'; +import ModalCopyButton from '~/vue_shared/components/modal_copy_button.vue'; +import SafeHtml from '~/vue_shared/directives/safe_html'; +import { getBaseURL } from '~/lib/utils/url_utility'; + +export const i18n = { + modalTitle: s__('ForksDivergence|Resolve merge conflicts manually'), + modalMessage: s__( + 'ForksDivergence|The upstream changes could not be synchronized to this project due to file conflicts in the default branch. You must resolve the conflicts manually:', + ), + step1: __('Step 1.'), + step2: __('Step 2.'), + step3: __('Step 3.'), + step4: __('Step 4.'), + step1Text: s__( + "ForksDivergence|Fetch the latest changes from the upstream repository's default branch:", + ), + step2Text: s__( + "ForksDivergence|Check out to a new branch, and merge the changes from the upstream project's default branch. You likely need to resolve conflicts during this step.", + ), + step3Text: s__('ForksDivergence|Push the updates to remote:'), + step4Text: s__("ForksDivergence|Create a merge request to your project's default branch."), + copyToClipboard: __('Copy to clipboard'), + close: __('Close'), +}; + +export default { + name: 'ForkSyncConflictsModal', + components: { + GlModal, + GlButton, + ModalCopyButton, + }, + directives: { + SafeHtml, + }, + props: { + sourceDefaultBranch: { + type: String, + required: false, + default: '', + }, + sourceName: { + type: String, + required: false, + default: '', + }, + sourcePath: { + type: String, + required: false, + default: '', + }, + }, + computed: { + instructionsStep1() { + const baseUrl = getBaseURL(); + return `git fetch ${baseUrl}${this.sourcePath} ${this.sourceDefaultBranch}`; + }, + }, + methods: { + show() { + this.$refs.modal.show(); + }, + hide() { + this.$refs.modal.hide(); + }, + }, + i18n, + instructionsStep2: 'git checkout -b <new-branch-name>\ngit merge FETCH_HEAD', + instructionsStep2Clipboard: 'git checkout -b <new-branch-name>\ngit merge FETCH_HEAD', + instructionsStep3: 'git commit\ngit push', +}; +</script> +<template> + <gl-modal + ref="modal" + modal-id="fork-sync-conflicts-modal" + :title="$options.i18n.modalTitle" + size="md" + > + <p>{{ $options.i18n.modalMessage }}</p> + <p> + <b> {{ $options.i18n.step1 }}</b> {{ $options.i18n.modalMessage }} + </p> + <div class="gl-display-flex gl-mb-4"> + <pre class="gl-w-full gl-mb-0 gl-mr-3" data-testid="resolve-conflict-instructions">{{ + instructionsStep1 + }}</pre> + <modal-copy-button + modal-id="fork-sync-conflicts-modal" + :text="instructionsStep1" + :title="$options.i18n.copyToClipboard" + class="gl-shadow-none! gl-bg-transparent! gl-flex-shrink-0" + /> + </div> + <p> + <b> {{ $options.i18n.step2 }}</b> {{ $options.i18n.step2Text }} + </p> + <div class="gl-display-flex gl-mb-4"> + <pre + class="gl-w-full gl-mb-0 gl-mr-3" + data-testid="resolve-conflict-instructions" + v-html="$options.instructionsStep2 /* eslint-disable-line vue/no-v-html */" + ></pre> + <modal-copy-button + modal-id="fork-sync-conflicts-modal" + :text="$options.instructionsStep2Clipboard" + :title="$options.i18n.copyToClipboard" + class="gl-shadow-none! gl-bg-transparent! gl-flex-shrink-0" + /> + </div> + <p> + <b> {{ $options.i18n.step3 }}</b> {{ $options.i18n.step3Text }} + </p> + <div class="gl-display-flex gl-mb-4"> + <pre class="gl-w-full gl-mb-0" data-testid="resolve-conflict-instructions" + >{{ $options.instructionsStep3 }} +</pre + > + <modal-copy-button + modal-id="fork-sync-conflicts-modal" + :text="$options.instructionsStep3" + :title="$options.i18n.copyToClipboard" + class="gl-shadow-none! gl-bg-transparent! gl-flex-shrink-0 gl-ml-3" + /> + </div> + <p> + <b> {{ $options.i18n.step4 }}</b> {{ $options.i18n.step4Text }} + </p> + <template #modal-footer> + <gl-button @click="hide" @keydown.esc="hide">{{ $options.i18n.close }}</gl-button> + </template> + </gl-modal> +</template> diff --git a/app/assets/javascripts/repository/constants.js b/app/assets/javascripts/repository/constants.js index 73fecee92b7..a6191203b2f 100644 --- a/app/assets/javascripts/repository/constants.js +++ b/app/assets/javascripts/repository/constants.js @@ -105,3 +105,10 @@ export const i18n = { generalError: __('An error occurred while fetching folder content.'), gitalyError: __('Error: Gitaly is unavailable. Contact your administrator.'), }; + +export const FIVE_MINUTES_IN_MS = 1000 * 60 * 5; + +export const POLLING_INTERVAL_DEFAULT = 2500; +export const POLLING_INTERVAL_BACKOFF = 2; + +export const CONFLICTS_MODAL_ID = 'fork-sync-conflicts-modal'; diff --git a/app/assets/javascripts/repository/index.js b/app/assets/javascripts/repository/index.js index 494e270a66c..6cedc606a37 100644 --- a/app/assets/javascripts/repository/index.js +++ b/app/assets/javascripts/repository/index.js @@ -69,7 +69,13 @@ export default function setupVueRepositoryList() { if (!forkEl) { return null; } - const { sourceName, sourcePath, aheadComparePath, behindComparePath } = forkEl.dataset; + const { + sourceName, + sourcePath, + sourceDefaultBranch, + aheadComparePath, + behindComparePath, + } = forkEl.dataset; return new Vue({ el: forkEl, apolloProvider, @@ -80,6 +86,7 @@ export default function setupVueRepositoryList() { selectedBranch: ref, sourceName, sourcePath, + sourceDefaultBranch, aheadComparePath, behindComparePath, }, diff --git a/app/assets/javascripts/repository/mutations/sync_fork.mutation.graphql b/app/assets/javascripts/repository/mutations/sync_fork.mutation.graphql new file mode 100644 index 00000000000..b3426038694 --- /dev/null +++ b/app/assets/javascripts/repository/mutations/sync_fork.mutation.graphql @@ -0,0 +1,11 @@ +mutation syncFork($projectPath: ID!, $targetBranch: String!) { + projectSyncFork(input: { projectPath: $projectPath, targetBranch: $targetBranch }) { + details { + ahead + behind + isSyncing + hasConflicts + } + errors + } +} diff --git a/app/assets/javascripts/repository/queries/fork_details.query.graphql b/app/assets/javascripts/repository/queries/fork_details.query.graphql index d1a37d00d55..3d37f69b48d 100644 --- a/app/assets/javascripts/repository/queries/fork_details.query.graphql +++ b/app/assets/javascripts/repository/queries/fork_details.query.graphql @@ -4,6 +4,8 @@ query getForkDetails($projectPath: ID!, $ref: String) { forkDetails(ref: $ref) { ahead behind + isSyncing + hasConflicts } } } diff --git a/app/assets/stylesheets/framework/filters.scss b/app/assets/stylesheets/framework/filters.scss index f10b1974a4b..16c0a67f137 100644 --- a/app/assets/stylesheets/framework/filters.scss +++ b/app/assets/stylesheets/framework/filters.scss @@ -227,7 +227,7 @@ min-width: 200px; padding-right: 25px; padding-left: 0; - height: $input-height - 2; + height: $input-height; line-height: inherit; &, diff --git a/app/assets/stylesheets/framework/forms.scss b/app/assets/stylesheets/framework/forms.scss index b6ac4939a9c..3e1dff18f2a 100644 --- a/app/assets/stylesheets/framework/forms.scss +++ b/app/assets/stylesheets/framework/forms.scss @@ -159,6 +159,7 @@ label { } .select-control { + line-height: 1.3; padding-left: 10px; padding-right: 10px; appearance: none; @@ -211,7 +212,7 @@ label { .gl-show-field-errors { .form-control:not(textarea) { - height: 34px; + height: $input-height; } .gl-field-success-outline { @@ -249,7 +250,7 @@ label { .show-password-complexity-errors { .form-control:not(textarea) { - height: 34px; + height: $input-height; } .password-complexity-error-outline { diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index dff0ca9a819..0bc2e0583bb 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -745,7 +745,7 @@ $logs-p-color: #333; /* * Forms */ -$input-height: 34px; +$input-height: 32px; $input-danger-bg: #f2dede; $input-group-addon-bg: $gray-10; $gl-field-focus-shadow: rgba(0, 0, 0, 0.075); diff --git a/app/assets/stylesheets/startup/startup-dark.scss b/app/assets/stylesheets/startup/startup-dark.scss index d4270235b0d..b4e896325d6 100644 --- a/app/assets/stylesheets/startup/startup-dark.scss +++ b/app/assets/stylesheets/startup/startup-dark.scss @@ -119,7 +119,7 @@ kbd kbd { .form-control { display: block; width: 100%; - height: 34px; + height: 32px; padding: 0.375rem 0.75rem; font-size: 0.875rem; font-weight: 400; diff --git a/app/assets/stylesheets/startup/startup-general.scss b/app/assets/stylesheets/startup/startup-general.scss index 005b356aae7..0a0fa83ff67 100644 --- a/app/assets/stylesheets/startup/startup-general.scss +++ b/app/assets/stylesheets/startup/startup-general.scss @@ -119,7 +119,7 @@ kbd kbd { .form-control { display: block; width: 100%; - height: 34px; + height: 32px; padding: 0.375rem 0.75rem; font-size: 0.875rem; font-weight: 400; diff --git a/app/assets/stylesheets/startup/startup-signin.scss b/app/assets/stylesheets/startup/startup-signin.scss index fc7bb19fcfe..57f61508178 100644 --- a/app/assets/stylesheets/startup/startup-signin.scss +++ b/app/assets/stylesheets/startup/startup-signin.scss @@ -192,7 +192,7 @@ hr { .form-control { display: block; width: 100%; - height: 34px; + height: 32px; padding: 0.375rem 0.75rem; font-size: 0.875rem; font-weight: 400; @@ -721,7 +721,7 @@ label.label-bold { color: #89888d; } .gl-show-field-errors .form-control:not(textarea) { - height: 34px; + height: 32px; } .navbar-empty { justify-content: center; diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 7f6da83611e..f18055f80b7 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -39,6 +39,7 @@ class ProjectsController < Projects::ApplicationController before_action do push_frontend_feature_flag(:highlight_js, @project) push_frontend_feature_flag(:file_line_blame, @project) + push_frontend_feature_flag(:synchronize_fork, @project) push_licensed_feature(:file_locks) if @project.present? && @project.licensed_feature_available?(:file_locks) push_licensed_feature(:security_orchestration_policies) if @project.present? && @project.licensed_feature_available?(:security_orchestration_policies) push_force_frontend_feature_flag(:work_items, @project&.work_items_feature_flag_enabled?) diff --git a/app/graphql/types/branch_protections/base_access_level_type.rb b/app/graphql/types/branch_protections/base_access_level_type.rb index e6514ba8d7d..472733a6bc5 100644 --- a/app/graphql/types/branch_protections/base_access_level_type.rb +++ b/app/graphql/types/branch_protections/base_access_level_type.rb @@ -14,7 +14,7 @@ module Types type: GraphQL::Types::String, null: false, description: 'Human readable representation for this access level.', - method: 'humanize' + hash_key: 'humanize' end end end diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 33262957d16..a854b9990d2 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -133,6 +133,7 @@ module ProjectsHelper { source_name: source_project.full_name, source_path: project_path(source_project), + source_default_branch: source_default_branch, ahead_compare_path: project_compare_path( project, from: source_default_branch, to: ref, from_project_id: source_project.id ), diff --git a/app/models/projects/import_export/relation_export.rb b/app/models/projects/import_export/relation_export.rb index 9bdf10d7c0e..2771c5131b2 100644 --- a/app/models/projects/import_export/relation_export.rb +++ b/app/models/projects/import_export/relation_export.rb @@ -51,12 +51,16 @@ module Projects transition queued: :started end + event :retry do + transition started: :queued + end + event :finish do transition started: :finished end event :fail_op do - transition [:queued, :started] => :failed + transition [:queued, :started, :failed] => :failed end end @@ -65,6 +69,14 @@ module Projects project_tree_relation_names + EXTRA_RELATION_LIST end + + def mark_as_failed(export_error) + sanitized_error = Gitlab::UrlSanitizer.sanitize(export_error) + + fail_op + + update_column(:export_error, sanitized_error) + end end end end diff --git a/app/services/projects/import_export/relation_export_service.rb b/app/services/projects/import_export/relation_export_service.rb index dce40cf18ba..33da5b39c20 100644 --- a/app/services/projects/import_export/relation_export_service.rb +++ b/app/services/projects/import_export/relation_export_service.rb @@ -85,6 +85,7 @@ module Projects logger.error( message: 'Project relation export failed', export_error: error_message, + relation: relation_export.relation, project_export_job_id: project_export_job.id, project_name: project.name, project_id: project.id diff --git a/app/views/projects/protected_tags/_create_protected_tag.html.haml b/app/views/projects/protected_tags/_create_protected_tag.html.haml index d19a6401fc8..ef3974b04b5 100644 --- a/app/views/projects/protected_tags/_create_protected_tag.html.haml +++ b/app/views/projects/protected_tags/_create_protected_tag.html.haml @@ -1,9 +1,9 @@ - content_for :create_access_levels do .create_access_levels-container = dropdown_tag('Select', - options: { toggle_class: 'js-allowed-to-create wide', + options: { toggle_class: 'js-allowed-to-create js-multiselect wide', dropdown_class: 'dropdown-menu-selectable capitalize-header', - dropdown_qa_selector: 'access_levels_content', + dropdown_qa_selector: 'access_levels_content', dropdown_testid: 'allowed-to-create-dropdown', data: { field_name: 'protected_tag[create_access_levels_attributes][0][access_level]', input_id: 'create_access_levels_attributes', qa_selector: 'access_levels_dropdown' }}) = render 'projects/protected_tags/shared/create_protected_tag' diff --git a/app/views/projects/protected_tags/_protected_tag.html.haml b/app/views/projects/protected_tags/_protected_tag.html.haml index e0912bf39c0..68e4a5e97a3 100644 --- a/app/views/projects/protected_tags/_protected_tag.html.haml +++ b/app/views/projects/protected_tags/_protected_tag.html.haml @@ -1,4 +1,4 @@ = render layout: 'projects/protected_tags/shared/protected_tag', locals: { protected_tag: protected_tag } do - %td - = render 'projects/protected_tags/protected_tag_create_access_levels', protected_tag: protected_tag, create_access_level: protected_tag.create_access_levels.for_role.first + %td.create_access_levels-container + = render 'projects/protected_tags/protected_tag_create_access_levels', protected_tag: protected_tag, create_access_level: protected_tag.create_access_levels.for_role = render_if_exists 'projects/protected_tags/protected_tag_extra_create_access_levels', protected_tag: protected_tag diff --git a/app/views/projects/protected_tags/_protected_tag_create_access_levels.haml b/app/views/projects/protected_tags/_protected_tag_create_access_levels.haml index 1d4e9565156..30b9e3e9005 100644 --- a/app/views/projects/protected_tags/_protected_tag_create_access_levels.haml +++ b/app/views/projects/protected_tags/_protected_tag_create_access_levels.haml @@ -1,8 +1,8 @@ - protected_tag = local_assigns.fetch(:protected_tag) - create_access_level = local_assigns.fetch(:create_access_level) -- dropdown_label = create_access_level&.humanize || 'Select' +- dropdown_label = create_access_level.first&.humanize || 'Select' -= hidden_field_tag "allowed_to_create_#{protected_tag.id}", create_access_level&.access_level += hidden_field_tag "allowed_to_create_#{protected_tag.id}", create_access_level.first&.access_level = dropdown_tag(dropdown_label, - options: { toggle_class: 'js-allowed-to-create', dropdown_class: 'dropdown-menu-selectable capitalize-header js-allowed-to-create-container', - data: { field_name: "allowed_to_create_#{protected_tag.id}", access_level_id: create_access_level&.id }}) + options: { toggle_class: 'js-allowed-to-create js-multiselect', dropdown_class: 'dropdown-menu-selectable capitalize-header js-allowed-to-create-container', + data: { field_name: "allowed_to_create_#{protected_tag.id}", preselected_items: access_levels_data(create_access_level) }}) diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml index ef4c31c696e..1624538152e 100644 --- a/app/workers/all_queues.yml +++ b/app/workers/all_queues.yml @@ -3144,6 +3144,15 @@ :weight: 1 :idempotent: false :tags: [] +- :name: projects_import_export_create_relation_exports + :worker_name: Projects::ImportExport::CreateRelationExportsWorker + :feature_category: :importers + :has_external_dependencies: false + :urgency: :low + :resource_boundary: :cpu + :weight: 1 + :idempotent: true + :tags: [] - :name: projects_import_export_parallel_project_export :worker_name: Projects::ImportExport::ParallelProjectExportWorker :feature_category: :importers @@ -3162,6 +3171,15 @@ :weight: 1 :idempotent: true :tags: [] +- :name: projects_import_export_wait_relation_exports + :worker_name: Projects::ImportExport::WaitRelationExportsWorker + :feature_category: :importers + :has_external_dependencies: false + :urgency: :low + :resource_boundary: :cpu + :weight: 1 + :idempotent: true + :tags: [] - :name: projects_inactive_projects_deletion_notification :worker_name: Projects::InactiveProjectsDeletionNotificationWorker :feature_category: :compliance_management diff --git a/app/workers/projects/import_export/create_relation_exports_worker.rb b/app/workers/projects/import_export/create_relation_exports_worker.rb new file mode 100644 index 00000000000..9ca69a5500a --- /dev/null +++ b/app/workers/projects/import_export/create_relation_exports_worker.rb @@ -0,0 +1,48 @@ +# frozen_string_literal: true + +module Projects + module ImportExport + class CreateRelationExportsWorker + include ApplicationWorker + include ExceptionBacktrace + + idempotent! + data_consistency :always + deduplicate :until_executed + feature_category :importers + worker_resource_boundary :cpu + sidekiq_options status_expiration: StuckExportJobsWorker::EXPORT_JOBS_EXPIRATION + + # This delay is an arbitrary number to finish the export quicker in case all relations + # are exported before the first execution of the WaitRelationExportsWorker worker. + INITIAL_DELAY = 10.seconds + + # rubocop: disable CodeReuse/ActiveRecord + def perform(user_id, project_id, after_export_strategy = {}) + project = Project.find_by_id(project_id) + return unless project + + project_export_job = project.export_jobs.find_or_create_by!(jid: jid) + return if project_export_job.started? + + relation_exports = RelationExport.relation_names_list.map do |relation_name| + project_export_job.relation_exports.find_or_create_by!(relation: relation_name) + end + + relation_exports.each do |relation_export| + RelationExportWorker.with_status.perform_async(relation_export.id) + end + + WaitRelationExportsWorker.perform_in( + INITIAL_DELAY, + project_export_job.id, + user_id, + after_export_strategy + ) + + project_export_job.start! + end + # rubocop: enable CodeReuse/ActiveRecord + end + end +end diff --git a/app/workers/projects/import_export/relation_export_worker.rb b/app/workers/projects/import_export/relation_export_worker.rb index 13ca33c4457..7747d4f4099 100644 --- a/app/workers/projects/import_export/relation_export_worker.rb +++ b/app/workers/projects/import_export/relation_export_worker.rb @@ -10,13 +10,34 @@ module Projects data_consistency :always deduplicate :until_executed feature_category :importers - sidekiq_options status_expiration: StuckExportJobsWorker::EXPORT_JOBS_EXPIRATION + sidekiq_options dead: false, status_expiration: StuckExportJobsWorker::EXPORT_JOBS_EXPIRATION urgency :low worker_resource_boundary :memory + sidekiq_retries_exhausted do |job, exception| + relation_export = Projects::ImportExport::RelationExport.find(job['args'].first) + project_export_job = relation_export.project_export_job + project = project_export_job.project + + relation_export.mark_as_failed(job['error_message']) + + log_payload = { + message: 'Project relation export failed', + export_error: job['error_message'], + relation: relation_export.relation, + project_export_job_id: project_export_job.id, + project_name: project.name, + project_id: project.id + } + Gitlab::ExceptionLogFormatter.format!(exception, log_payload) + Gitlab::Export::Logger.error(log_payload) + end + def perform(project_relation_export_id) relation_export = Projects::ImportExport::RelationExport.find(project_relation_export_id) + relation_export.retry! if relation_export.started? + if relation_export.queued? Projects::ImportExport::RelationExportService.new(relation_export, jid).execute end diff --git a/app/workers/projects/import_export/wait_relation_exports_worker.rb b/app/workers/projects/import_export/wait_relation_exports_worker.rb new file mode 100644 index 00000000000..4250073edce --- /dev/null +++ b/app/workers/projects/import_export/wait_relation_exports_worker.rb @@ -0,0 +1,82 @@ +# frozen_string_literal: true + +module Projects + module ImportExport + class WaitRelationExportsWorker + include ApplicationWorker + include ExceptionBacktrace + + idempotent! + data_consistency :always + deduplicate :until_executed + feature_category :importers + loggable_arguments 1, 2 + worker_resource_boundary :cpu + sidekiq_options dead: false, status_expiration: StuckExportJobsWorker::EXPORT_JOBS_EXPIRATION + + INTERVAL = 1.minute + + def perform(project_export_job_id, user_id, after_export_strategy = {}) + @export_job = ProjectExportJob.find(project_export_job_id) + + return unless @export_job.started? + + @export_job.update_attribute(:jid, jid) + @relation_exports = @export_job.relation_exports + + if queued_relation_exports.any? || started_relation_exports.any? + fail_started_jobs_no_longer_running + + self.class.perform_in(INTERVAL, project_export_job_id, user_id, after_export_strategy) + return + end + + if all_relation_export_finished? + ParallelProjectExportWorker.perform_async(project_export_job_id, user_id, after_export_strategy) + return + end + + fail_and_notify_user(user_id) + end + + private + + def relation_exports_with_status(status) + @relation_exports.select { |relation_export| relation_export.status == status } + end + + def queued_relation_exports + relation_exports_with_status(RelationExport::STATUS[:queued]) + end + + def started_relation_exports + @started_relation_exports ||= relation_exports_with_status(RelationExport::STATUS[:started]) + end + + def all_relation_export_finished? + @relation_exports.all? { |relation_export| relation_export.status == RelationExport::STATUS[:finished] } + end + + def fail_started_jobs_no_longer_running + started_relation_exports.each do |relation_export| + next if Gitlab::SidekiqStatus.running?(relation_export.jid) + next if relation_export.reset.finished? + + relation_export.mark_as_failed("Exausted number of retries to export: #{relation_export.relation}") + end + end + + def fail_and_notify_user(user_id) + @export_job.fail_op! + + @user = User.find_by_id(user_id) + return unless @user + + failed_relation_exports = relation_exports_with_status(RelationExport::STATUS[:failed]) + errors = failed_relation_exports.map(&:export_error) + + NotificationService.new.project_not_exported(@export_job.project, @user, errors) + end + end + end +end diff --git a/config/feature_flags/development/ci_fix_max_includes.yml b/config/feature_flags/development/ci_fix_max_includes.yml index ef993f4f7ee..b70fb3f1222 100644 --- a/config/feature_flags/development/ci_fix_max_includes.yml +++ b/config/feature_flags/development/ci_fix_max_includes.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/390909 milestone: '15.10' type: development group: group::pipeline authoring -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/development/use_traversal_ids_for_ancestors_upto.yml b/config/feature_flags/development/use_traversal_ids_for_ancestors_upto.yml index 9da967f87ea..0db0f083dcb 100644 --- a/config/feature_flags/development/use_traversal_ids_for_ancestors_upto.yml +++ b/config/feature_flags/development/use_traversal_ids_for_ancestors_upto.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343619 milestone: '14.6' type: development group: group::workspace -default_enabled: false +default_enabled: true diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index c9b80dab03a..e1de1b5d7c9 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -425,10 +425,14 @@ - 1 - - projects_git_garbage_collect - 1 +- - projects_import_export_create_relation_exports + - 1 - - projects_import_export_parallel_project_export - 1 - - projects_import_export_relation_export - 1 +- - projects_import_export_wait_relation_exports + - 1 - - projects_inactive_projects_deletion_notification - 1 - - projects_post_creation diff --git a/doc/api/group_badges.md b/doc/api/group_badges.md index 0d5faae7c14..4c225e8aacb 100644 --- a/doc/api/group_badges.md +++ b/doc/api/group_badges.md @@ -1,6 +1,6 @@ --- -stage: Manage -group: Organization +stage: Data Stores +group: Tenant Scale info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- diff --git a/doc/api/groups.md b/doc/api/groups.md index 8b4850fa6de..2d1005a896b 100644 --- a/doc/api/groups.md +++ b/doc/api/groups.md @@ -1,6 +1,6 @@ --- -stage: Manage -group: Organization +stage: Data Stores +group: Tenant Scale info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- diff --git a/doc/api/projects.md b/doc/api/projects.md index 24d06caf84b..3cd7cdd811d 100644 --- a/doc/api/projects.md +++ b/doc/api/projects.md @@ -1,6 +1,6 @@ --- -stage: Manage -group: Organization +stage: Data Stores +group: Tenant Scale info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- diff --git a/doc/api/topics.md b/doc/api/topics.md index 8acf6bd645d..8f2aae9e070 100644 --- a/doc/api/topics.md +++ b/doc/api/topics.md @@ -1,6 +1,6 @@ --- -stage: Manage -group: Organization +stage: Data Stores +group: Tenant Scale info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- diff --git a/doc/development/image_scaling.md b/doc/development/image_scaling.md index d182bd8333e..48b780b50bf 100644 --- a/doc/development/image_scaling.md +++ b/doc/development/image_scaling.md @@ -1,6 +1,6 @@ --- -stage: Manage -group: Organization +stage: Data Stores +group: Tenant Scale info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- diff --git a/doc/integration/mattermost/index.md b/doc/integration/mattermost/index.md index b70737fb69e..e1183f62225 100644 --- a/doc/integration/mattermost/index.md +++ b/doc/integration/mattermost/index.md @@ -245,7 +245,7 @@ For local connections, the `mmctl` binary and Mattermost must be run from the sa "LocalModeSocketLocation": "/var/tmp/mattermost_local.socket", ... } - } + } ``` 1. Restart Mattermost: @@ -280,7 +280,7 @@ $ /opt/gitlab/embedded/bin/mmctl auth login http://mattermost.example.com Connection name: test Username: local-user -Password: +Password: credentials for "test": "local-user@http://mattermost.example.com" stored ``` @@ -378,6 +378,10 @@ If this is not the case, there are two options: For a complete list of upgrade notices and special considerations for older versions, see the [Mattermost documentation](https://docs.mattermost.com/administration/important-upgrade-notes.html). +## Upgrading GitLab Mattermost to 15.10 + +GitLab 15.10 ships with Mattermost 7.8. Before upgrading, [connect to the bundled PostgreSQL database](#connecting-to-the-bundled-postgresql-database) to perform the PostgreSQL maintenance described in the [Important Upgrade Notes](https://docs.mattermost.com/administration/important-upgrade-notes.html) provided by Mattermost. + ## Upgrading GitLab Mattermost to 14.6 GitLab 14.6 ships with Mattermost 6.1 including potentially long running database migrations for Mattermost 6.0. For information about upgrading and for ways to reduce the downtime caused by those migrations, read the [Important Upgrade Notes](https://docs.mattermost.com/administration/important-upgrade-notes.html) for both versions. If you need to perform any manual migrations, [connect to the bundled PostgreSQL database](#connecting-to-the-bundled-postgresql-database). diff --git a/doc/user/admin_area/settings/rate_limit_on_projects_api.md b/doc/user/admin_area/settings/rate_limit_on_projects_api.md index eb4066fed00..beed083c484 100644 --- a/doc/user/admin_area/settings/rate_limit_on_projects_api.md +++ b/doc/user/admin_area/settings/rate_limit_on_projects_api.md @@ -1,7 +1,7 @@ --- type: reference -stage: Manage -group: Organization +stage: Data Stores +group: Tenant Scale info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- diff --git a/doc/user/admin_area/settings/third_party_offers.md b/doc/user/admin_area/settings/third_party_offers.md index 4f6e727f673..6037b24a294 100644 --- a/doc/user/admin_area/settings/third_party_offers.md +++ b/doc/user/admin_area/settings/third_party_offers.md @@ -1,6 +1,6 @@ --- -stage: Manage -group: Organization +stage: Data Stores +group: Tenant Scale info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments type: reference --- diff --git a/doc/user/group/access_and_permissions.md b/doc/user/group/access_and_permissions.md index e061d0070e1..0299f5c1a74 100644 --- a/doc/user/group/access_and_permissions.md +++ b/doc/user/group/access_and_permissions.md @@ -1,6 +1,6 @@ --- -stage: Manage -group: Organization +stage: Data Stores +group: Tenant Scale info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- diff --git a/doc/user/group/index.md b/doc/user/group/index.md index db01358d899..d35a0920cf2 100644 --- a/doc/user/group/index.md +++ b/doc/user/group/index.md @@ -1,6 +1,6 @@ --- -stage: Manage -group: Organization +stage: Data Stores +group: Tenant Scale info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- diff --git a/doc/user/group/manage.md b/doc/user/group/manage.md index 4a380fc51db..2eb1c0fcce5 100644 --- a/doc/user/group/manage.md +++ b/doc/user/group/manage.md @@ -1,6 +1,6 @@ --- -stage: Manage -group: Organization +stage: Data Stores +group: Tenant Scale info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- diff --git a/doc/user/group/subgroups/index.md b/doc/user/group/subgroups/index.md index 976b8d6fa5d..63ffbf62981 100644 --- a/doc/user/group/subgroups/index.md +++ b/doc/user/group/subgroups/index.md @@ -1,6 +1,6 @@ --- -stage: Manage -group: Organization +stage: Data Stores +group: Tenant Scale info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- diff --git a/doc/user/markdown.md b/doc/user/markdown.md index 3f134f33abc..30432b8b492 100644 --- a/doc/user/markdown.md +++ b/doc/user/markdown.md @@ -686,9 +686,7 @@ You can embed GitLab Observability UI dashboards descriptions and comments, for To embed an Observability dashboard URL: -1. In GitLab Observability UI, in the upper-right corner, select **Copy shortened link**. - -  +1. In GitLab Observability UI, copy the URL in the address bar. 1. Paste your link wherever you want to embed your dashboard. GitLab Flavored Markdown recognizes the URL and displays the source. diff --git a/doc/user/namespace/index.md b/doc/user/namespace/index.md index 7463b8f1099..00eb63da3ff 100644 --- a/doc/user/namespace/index.md +++ b/doc/user/namespace/index.md @@ -1,6 +1,6 @@ --- -stage: Manage -group: Organization +stage: Data Stores +group: Tenant Scale info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- diff --git a/doc/user/profile/contributions_calendar.md b/doc/user/profile/contributions_calendar.md index ea47fed02b5..7b5691e1ee5 100644 --- a/doc/user/profile/contributions_calendar.md +++ b/doc/user/profile/contributions_calendar.md @@ -1,6 +1,6 @@ --- -stage: Manage -group: Organization +stage: Data Stores +group: Tenant Scale info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments type: concepts, howto --- diff --git a/doc/user/project/badges.md b/doc/user/project/badges.md index a911031118f..2d36a378b82 100644 --- a/doc/user/project/badges.md +++ b/doc/user/project/badges.md @@ -1,6 +1,6 @@ --- -stage: Manage -group: Organization +stage: Data Stores +group: Tenant Scale info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- diff --git a/doc/user/project/index.md b/doc/user/project/index.md index 4f3fff1b38d..da0546b85e6 100644 --- a/doc/user/project/index.md +++ b/doc/user/project/index.md @@ -1,6 +1,6 @@ --- -stage: Manage -group: Organization +stage: Data Stores +group: Tenant Scale info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments" --- diff --git a/doc/user/project/members/index.md b/doc/user/project/members/index.md index c7d45b0bd15..6e20492db05 100644 --- a/doc/user/project/members/index.md +++ b/doc/user/project/members/index.md @@ -1,6 +1,6 @@ --- -stage: Manage -group: Organization +stage: Data Stores +group: Tenant Scale info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- diff --git a/doc/user/project/members/share_project_with_groups.md b/doc/user/project/members/share_project_with_groups.md index 9d70602d279..356e4e1b194 100644 --- a/doc/user/project/members/share_project_with_groups.md +++ b/doc/user/project/members/share_project_with_groups.md @@ -1,6 +1,6 @@ --- -stage: Manage -group: Organization +stage: Data Stores +group: Tenant Scale info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- diff --git a/doc/user/project/organize_work_with_projects.md b/doc/user/project/organize_work_with_projects.md index 2b4ce6d2fd0..85a1dfda679 100644 --- a/doc/user/project/organize_work_with_projects.md +++ b/doc/user/project/organize_work_with_projects.md @@ -1,6 +1,6 @@ --- -stage: Manage -group: Organization +stage: Data Stores +group: Tenant Scale info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- diff --git a/doc/user/project/settings/index.md b/doc/user/project/settings/index.md index 7d3e5a72289..7250406144f 100644 --- a/doc/user/project/settings/index.md +++ b/doc/user/project/settings/index.md @@ -1,6 +1,6 @@ --- -stage: Manage -group: Organization +stage: Data Stores +group: Tenant Scale info: 'To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments' type: reference, index, howto --- diff --git a/doc/user/project/working_with_projects.md b/doc/user/project/working_with_projects.md index 5910cd5a11c..24ca86fc93b 100644 --- a/doc/user/project/working_with_projects.md +++ b/doc/user/project/working_with_projects.md @@ -1,6 +1,6 @@ --- -stage: Manage -group: Organization +stage: Data Stores +group: Tenant Scale info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments" --- diff --git a/doc/user/public_access.md b/doc/user/public_access.md index 2a9a9fb84fe..87380ec324e 100644 --- a/doc/user/public_access.md +++ b/doc/user/public_access.md @@ -1,6 +1,6 @@ --- -stage: Manage -group: Organization +stage: Data Stores +group: Tenant Scale info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments type: reference --- diff --git a/doc/user/reserved_names.md b/doc/user/reserved_names.md index 372ec141112..6e8a7e7c1cf 100644 --- a/doc/user/reserved_names.md +++ b/doc/user/reserved_names.md @@ -1,6 +1,6 @@ --- -stage: Manage -group: Organization +stage: Data Stores +group: Tenant Scale info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments --- diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 14668bd1929..d37b657ec8f 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -10684,7 +10684,7 @@ msgstr "" msgid "ComplianceFrameworks|Remove default" msgstr "" -msgid "ComplianceFrameworks|Required format: %{codeStart}path/file.y[a]ml@group-name/project-name%{codeEnd}. %{linkStart}What is a compliance pipeline configuration?%{linkEnd}" +msgid "ComplianceFrameworks|Required format: %{codeStart}path/file.y[a]ml@group-name/project-name%{codeEnd}. %{linkStart}See some examples%{linkEnd}." msgstr "" msgid "ComplianceFrameworks|Set default" @@ -18290,15 +18290,39 @@ msgstr "" msgid "ForksDivergence|%{messages} the upstream repository." msgstr "" +msgid "ForksDivergence|Check out to a new branch, and merge the changes from the upstream project's default branch. You likely need to resolve conflicts during this step." +msgstr "" + +msgid "ForksDivergence|Create a merge request to your project's default branch." +msgstr "" + msgid "ForksDivergence|Failed to fetch fork details. Try again later." msgstr "" +msgid "ForksDivergence|Fetch the latest changes from the upstream repository's default branch:" +msgstr "" + +msgid "ForksDivergence|Push the updates to remote:" +msgstr "" + +msgid "ForksDivergence|Resolve merge conflicts manually" +msgstr "" + +msgid "ForksDivergence|Source project has a limited visibility." +msgstr "" + +msgid "ForksDivergence|The upstream changes could not be synchronized to this project due to file conflicts in the default branch. You must resolve the conflicts manually:" +msgstr "" + msgid "ForksDivergence|This fork has diverged from the upstream repository." msgstr "" msgid "ForksDivergence|Up to date with the upstream repository." msgstr "" +msgid "ForksDivergence|Update fork" +msgstr "" + msgid "Format: %{dateFormat}" msgstr "" diff --git a/scripts/generate-e2e-pipeline b/scripts/generate-e2e-pipeline index 1d4ecf6619d..8ca6771bf1f 100755 --- a/scripts/generate-e2e-pipeline +++ b/scripts/generate-e2e-pipeline @@ -27,7 +27,7 @@ variables: GIT_STRATEGY: "clone" # 'GIT_STRATEGY: clone' optimizes the pack-objects cache hit ratio GIT_SUBMODULE_STRATEGY: "none" GITLAB_QA_CACHE_KEY: "$qa_cache_key" - GITLAB_VERSION: "$(cat VERSION)" + GITLAB_SEMVER_VERSION: "$(cat VERSION)" QA_EXPORT_TEST_METRICS: "${QA_EXPORT_TEST_METRICS:-true}" QA_FEATURE_FLAGS: "${QA_FEATURE_FLAGS}" QA_FRAMEWORK_CHANGES: "${QA_FRAMEWORK_CHANGES:-false}" diff --git a/spec/features/protected_tags_spec.rb b/spec/features/protected_tags_spec.rb index c2058a5c345..45315f53fd6 100644 --- a/spec/features/protected_tags_spec.rb +++ b/spec/features/protected_tags_spec.rb @@ -16,8 +16,8 @@ RSpec.describe 'Protected Tags', :js, :with_license, feature_category: :source_c it "allows creating explicit protected tags" do visit project_protected_tags_path(project) set_protected_tag_name('some-tag') - set_allowed_to('create') if Gitlab.ee? - click_on "Protect" + set_allowed_to('create') + click_on_protect within(".protected-tags-list") { expect(page).to have_content('some-tag') } expect(ProtectedTag.count).to eq(1) @@ -30,8 +30,8 @@ RSpec.describe 'Protected Tags', :js, :with_license, feature_category: :source_c visit project_protected_tags_path(project) set_protected_tag_name('some-tag') - set_allowed_to('create') if Gitlab.ee? - click_on "Protect" + set_allowed_to('create') + click_on_protect within(".protected-tags-list") { expect(page).to have_content(commit.id[0..7]) } end @@ -39,8 +39,8 @@ RSpec.describe 'Protected Tags', :js, :with_license, feature_category: :source_c it "displays an error message if the named tag does not exist" do visit project_protected_tags_path(project) set_protected_tag_name('some-tag') - set_allowed_to('create') if Gitlab.ee? - click_on "Protect" + set_allowed_to('create') + click_on_protect within(".protected-tags-list") { expect(page).to have_content('tag was removed') } end @@ -50,8 +50,8 @@ RSpec.describe 'Protected Tags', :js, :with_license, feature_category: :source_c it "allows creating protected tags with a wildcard" do visit project_protected_tags_path(project) set_protected_tag_name('*-stable') - set_allowed_to('create') if Gitlab.ee? - click_on "Protect" + set_allowed_to('create') + click_on_protect within(".protected-tags-list") { expect(page).to have_content('*-stable') } expect(ProtectedTag.count).to eq(1) @@ -64,8 +64,8 @@ RSpec.describe 'Protected Tags', :js, :with_license, feature_category: :source_c visit project_protected_tags_path(project) set_protected_tag_name('*-stable') - set_allowed_to('create') if Gitlab.ee? - click_on "Protect" + set_allowed_to('create') + click_on_protect within(".protected-tags-list") do expect(page).to have_content("Protected tags (2)") @@ -80,8 +80,8 @@ RSpec.describe 'Protected Tags', :js, :with_license, feature_category: :source_c visit project_protected_tags_path(project) set_protected_tag_name('*-stable') - set_allowed_to('create') if Gitlab.ee? - click_on "Protect" + set_allowed_to('create') + click_on_protect visit project_protected_tags_path(project) click_on "2 matching tags" @@ -101,4 +101,14 @@ RSpec.describe 'Protected Tags', :js, :with_license, feature_category: :source_c include_examples "protected tags > access control > CE" end + + context 'when the users for protected tags feature is off' do + before do + stub_licensed_features(protected_refs_for_users: false) + end + + include_examples 'Deploy keys with protected tags' do + let(:all_dropdown_sections) { ['Roles', 'Deploy Keys'] } + end + end end diff --git a/spec/frontend/projects/settings/components/new_access_dropdown_spec.js b/spec/frontend/projects/settings/components/new_access_dropdown_spec.js index b4b6603888c..f3e536de703 100644 --- a/spec/frontend/projects/settings/components/new_access_dropdown_spec.js +++ b/spec/frontend/projects/settings/components/new_access_dropdown_spec.js @@ -94,6 +94,7 @@ describe('Access Level Dropdown', () => { const findAllDropdownItems = () => findDropdown().findAllComponents(GlDropdownItem); const findAllDropdownHeaders = () => findDropdown().findAllComponents(GlDropdownSectionHeader); const findSearchBox = () => wrapper.findComponent(GlSearchBoxByType); + const findDeployKeyDropdownItem = () => wrapper.findByTestId('deploy_key-dropdown-item'); const findDropdownItemWithText = (items, text) => items.filter((item) => item.text().includes(text)).at(0); @@ -138,6 +139,21 @@ describe('Access Level Dropdown', () => { it('renders dropdown item for each access level type', () => { expect(findAllDropdownItems()).toHaveLength(12); }); + + it.each` + accessLevel | shouldRenderDeployKeyItems + ${ACCESS_LEVELS.PUSH} | ${true} + ${ACCESS_LEVELS.CREATE} | ${true} + ${ACCESS_LEVELS.MERGE} | ${false} + `( + 'conditionally renders deploy keys based on access levels', + async ({ accessLevel, shouldRenderDeployKeyItems }) => { + createComponent({ accessLevel }); + await waitForPromises(); + + expect(findDeployKeyDropdownItem().exists()).toBe(shouldRenderDeployKeyItems); + }, + ); }); describe('toggleLabel', () => { diff --git a/spec/frontend/repository/components/fork_info_spec.js b/spec/frontend/repository/components/fork_info_spec.js index 4b86d9425bc..7a2b03a8d8f 100644 --- a/spec/frontend/repository/components/fork_info_spec.js +++ b/spec/frontend/repository/components/fork_info_spec.js @@ -1,13 +1,16 @@ import Vue from 'vue'; import VueApollo from 'vue-apollo'; -import { GlSkeletonLoader, GlIcon, GlLink, GlSprintf } from '@gitlab/ui'; +import { GlSkeletonLoader, GlIcon, GlLink, GlSprintf, GlButton, GlLoadingIcon } from '@gitlab/ui'; import createMockApollo from 'helpers/mock_apollo_helper'; import waitForPromises from 'helpers/wait_for_promises'; +import { stubComponent } from 'helpers/stub_component'; import { shallowMountExtended } from 'helpers/vue_test_utils_helper'; import { createAlert } from '~/alert'; import ForkInfo, { i18n } from '~/repository/components/fork_info.vue'; +import ConflictsModal from '~/repository/components/fork_sync_conflicts_modal.vue'; import forkDetailsQuery from '~/repository/queries/fork_details.query.graphql'; +import syncForkMutation from '~/repository/mutations/sync_fork.mutation.graphql'; import { propsForkInfo } from '../mock_data'; jest.mock('~/alert'); @@ -17,26 +20,56 @@ describe('ForkInfo component', () => { let mockResolver; const forkInfoError = new Error('Something went wrong'); const projectId = 'gid://gitlab/Project/1'; + const showMock = jest.fn(); + const synchronizeFork = true; Vue.use(VueApollo); - const createCommitData = ({ ahead = 3, behind = 7 }) => { + const createForkDetailsData = ( + forkDetails = { ahead: 3, behind: 7, isSyncing: false, hasConflicts: false }, + ) => { return { data: { - project: { id: projectId, forkDetails: { ahead, behind, __typename: 'ForkDetails' } }, + project: { id: projectId, forkDetails }, }, }; }; - const createComponent = (props = {}, data = {}, isRequestFailed = false) => { + const createSyncForkDetailsData = ( + forkDetails = { ahead: 3, behind: 7, isSyncing: false, hasConflicts: false }, + ) => { + return { + data: { + projectSyncFork: { details: forkDetails, errors: [] }, + }, + }; + }; + + const createComponent = (props = {}, data = {}, mutationData = {}, isRequestFailed = false) => { mockResolver = isRequestFailed ? jest.fn().mockRejectedValue(forkInfoError) - : jest.fn().mockResolvedValue(createCommitData(data)); + : jest.fn().mockResolvedValue(createForkDetailsData(data)); wrapper = shallowMountExtended(ForkInfo, { - apolloProvider: createMockApollo([[forkDetailsQuery, mockResolver]]), + apolloProvider: createMockApollo([ + [forkDetailsQuery, mockResolver], + [syncForkMutation, jest.fn().mockResolvedValue(createSyncForkDetailsData(mutationData))], + ]), propsData: { ...propsForkInfo, ...props }, - stubs: { GlSprintf }, + stubs: { + GlSprintf, + GlButton, + ConflictsModal: stubComponent(ConflictsModal, { + template: + '<div><slot name="modal-title"></slot><slot></slot><slot name="modal-footer"></slot></div>', + methods: { show: showMock }, + }), + }, + provide: { + glFeatures: { + synchronizeFork, + }, + }, }); return waitForPromises(); }; @@ -44,6 +77,8 @@ describe('ForkInfo component', () => { const findLink = () => wrapper.findComponent(GlLink); const findSkeleton = () => wrapper.findComponent(GlSkeletonLoader); const findIcon = () => wrapper.findComponent(GlIcon); + const findUpdateForkButton = () => wrapper.findComponent(GlButton); + const findLoadingIcon = () => wrapper.findComponent(GlLoadingIcon); const findDivergenceMessage = () => wrapper.findByTestId('divergence-message'); const findInaccessibleMessage = () => wrapper.findByTestId('inaccessible-project'); const findCompareLinks = () => findDivergenceMessage().findAllComponents(GlLink); @@ -87,14 +122,50 @@ describe('ForkInfo component', () => { expect(link.attributes('href')).toBe(propsForkInfo.sourcePath); }); - it('renders unknown divergence message when divergence is unknown', async () => { - await createComponent({}, { ahead: null, behind: null }); - expect(findDivergenceMessage().text()).toBe(i18n.unknown); + describe('Unknown divergence', () => { + beforeEach(async () => { + await createComponent( + {}, + { ahead: null, behind: null, isSyncing: false, hasConflicts: false }, + ); + }); + + it('renders unknown divergence message when divergence is unknown', async () => { + expect(findDivergenceMessage().text()).toBe(i18n.unknown); + }); + + it('renders Update Fork button', async () => { + expect(findUpdateForkButton().exists()).toBe(true); + expect(findUpdateForkButton().text()).toBe(i18n.sync); + }); + }); + + describe('Up to date divergence', () => { + beforeEach(async () => { + await createComponent({}, { ahead: 0, behind: 0, isSyncing: false, hasConflicts: false }); + }); + + it('renders up to date message when fork is up to date', async () => { + expect(findDivergenceMessage().text()).toBe(i18n.upToDate); + }); + + it('does not render Update Fork button', async () => { + expect(findUpdateForkButton().exists()).toBe(false); + }); }); - it('renders up to date message when divergence is unknown', async () => { - await createComponent({}, { ahead: 0, behind: 0 }); - expect(findDivergenceMessage().text()).toBe(i18n.upToDate); + describe('Limited visibility project', () => { + beforeEach(async () => { + await createComponent({}, null); + }); + + it('renders limited visibility messsage when forkDetails are empty', async () => { + expect(findDivergenceMessage().text()).toBe(i18n.limitedVisibility); + }); + + it('does not render Update Fork button', async () => { + expect(findUpdateForkButton().exists()).toBe(false); + }); }); describe.each([ @@ -104,6 +175,7 @@ describe('ForkInfo component', () => { message: '3 commits behind, 7 commits ahead of the upstream repository.', firstLink: propsForkInfo.behindComparePath, secondLink: propsForkInfo.aheadComparePath, + hasButton: true, }, { ahead: 7, @@ -111,6 +183,7 @@ describe('ForkInfo component', () => { message: '7 commits ahead of the upstream repository.', firstLink: propsForkInfo.aheadComparePath, secondLink: '', + hasButton: false, }, { ahead: 0, @@ -118,12 +191,13 @@ describe('ForkInfo component', () => { message: '3 commits behind the upstream repository.', firstLink: propsForkInfo.behindComparePath, secondLink: '', + hasButton: true, }, ])( 'renders correct divergence message for ahead: $ahead, behind: $behind divergence commits', - ({ ahead, behind, message, firstLink, secondLink }) => { + ({ ahead, behind, message, firstLink, secondLink, hasButton }) => { beforeEach(async () => { - await createComponent({}, { ahead, behind }); + await createComponent({}, { ahead, behind, isSyncing: false, hasConflicts: false }); }); it('displays correct text', () => { @@ -138,9 +212,38 @@ describe('ForkInfo component', () => { expect(links.at(1).attributes('href')).toBe(secondLink); } }); + + it('renders Update Fork button when fork is behind', () => { + expect(findUpdateForkButton().exists()).toBe(hasButton); + if (hasButton) { + expect(findUpdateForkButton().text()).toBe(i18n.sync); + } + }); }, ); + describe('when sync is not possible due to conflicts', () => { + it('opens Conflicts Modal', async () => { + await createComponent({}, { ahead: 7, behind: 3, isSyncing: false, hasConflicts: true }); + findUpdateForkButton().vm.$emit('click'); + expect(showMock).toHaveBeenCalled(); + }); + }); + + describe('projectSyncFork mutation', () => { + it('changes button to have loading state', async () => { + await createComponent( + {}, + { ahead: 0, behind: 3, isSyncing: false, hasConflicts: false }, + { ahead: 0, behind: 3, isSyncing: true, hasConflicts: false }, + ); + expect(findLoadingIcon().exists()).toBe(false); + findUpdateForkButton().vm.$emit('click'); + await waitForPromises(); + expect(findLoadingIcon().exists()).toBe(true); + }); + }); + it('renders alert with error message when request fails', async () => { await createComponent({}, {}, true); expect(createAlert).toHaveBeenCalledWith({ diff --git a/spec/frontend/repository/components/fork_sync_conflicts_modal_spec.js b/spec/frontend/repository/components/fork_sync_conflicts_modal_spec.js new file mode 100644 index 00000000000..f97c970275b --- /dev/null +++ b/spec/frontend/repository/components/fork_sync_conflicts_modal_spec.js @@ -0,0 +1,42 @@ +import { GlModal } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; +import ConflictsModal, { i18n } from '~/repository/components/fork_sync_conflicts_modal.vue'; +import { propsConflictsModal } from '../mock_data'; + +describe('ConflictsModal', () => { + let wrapper; + + function createComponent({ props = {} } = {}) { + wrapper = shallowMount(ConflictsModal, { + propsData: props, + stubs: { GlModal }, + }); + } + + beforeEach(() => { + createComponent({ props: propsConflictsModal }); + }); + + const findModal = () => wrapper.findComponent(GlModal); + const findInstructions = () => wrapper.findAll('[ data-testid="resolve-conflict-instructions"]'); + + it('renders a modal', () => { + expect(findModal().exists()).toBe(true); + }); + + it('passes title as a prop to a gl-modal component', () => { + expect(findModal().props().title).toBe(i18n.modalTitle); + }); + + it('renders a selection of markdown fields', () => { + expect(findInstructions().length).toBe(3); + }); + + it('renders a source url in a first intruction', () => { + expect(findInstructions().at(0).text()).toContain(propsConflictsModal.sourcePath); + }); + + it('renders default branch name in a first intruction', () => { + expect(findInstructions().at(0).text()).toContain(propsConflictsModal.sourceDefaultBranch); + }); +}); diff --git a/spec/frontend/repository/components/tree_content_spec.js b/spec/frontend/repository/components/tree_content_spec.js index 0f4edb19632..9597d8a7b77 100644 --- a/spec/frontend/repository/components/tree_content_spec.js +++ b/spec/frontend/repository/components/tree_content_spec.js @@ -20,9 +20,9 @@ let vm; let $apollo; const mockResponse = jest.fn().mockReturnValue(Promise.resolve({ data: {} })); -function factory(path, appoloMockResponse = mockResponse) { +function factory(path, apolloMockResponse = mockResponse) { $apollo = { - query: appoloMockResponse, + query: apolloMockResponse, }; vm = shallowMount(TreeContent, { diff --git a/spec/frontend/repository/mock_data.js b/spec/frontend/repository/mock_data.js index 04ffe52bc3f..418a93a10cc 100644 --- a/spec/frontend/repository/mock_data.js +++ b/spec/frontend/repository/mock_data.js @@ -126,3 +126,9 @@ export const propsForkInfo = { aheadComparePath: '/nataliia/myGitLab/-/compare/main...ref?from_project_id=1', behindComparePath: 'gitlab-org/gitlab/-/compare/ref...main?from_project_id=2', }; + +export const propsConflictsModal = { + sourceDefaultBranch: 'branch-name', + sourceName: 'source-name', + sourcePath: 'path/to/project', +}; diff --git a/spec/helpers/projects_helper_spec.rb b/spec/helpers/projects_helper_spec.rb index 9231b9db947..93352715ff4 100644 --- a/spec/helpers/projects_helper_spec.rb +++ b/spec/helpers/projects_helper_spec.rb @@ -1373,7 +1373,8 @@ RSpec.describe ProjectsHelper, feature_category: :source_code_management do source_name: source_project.full_name, source_path: project_path(source_project), ahead_compare_path: ahead_path, - behind_compare_path: behind_path + behind_compare_path: behind_path, + source_default_branch: source_project.default_branch }) end end diff --git a/spec/lib/gitlab/internal_post_receive/response_spec.rb b/spec/lib/gitlab/internal_post_receive/response_spec.rb index 23ea5191486..2792cf49d06 100644 --- a/spec/lib/gitlab/internal_post_receive/response_spec.rb +++ b/spec/lib/gitlab/internal_post_receive/response_spec.rb @@ -76,7 +76,7 @@ RSpec.describe Gitlab::InternalPostReceive::Response do describe '#add_alert_message' do context 'when text is present' do - it 'adds a alert message' do + it 'adds an alert message' do subject.add_alert_message('hello') expect(subject.messages.first.message).to eq('hello') diff --git a/spec/models/projects/import_export/relation_export_spec.rb b/spec/models/projects/import_export/relation_export_spec.rb index 8643fbc7b46..c724f30250d 100644 --- a/spec/models/projects/import_export/relation_export_spec.rb +++ b/spec/models/projects/import_export/relation_export_spec.rb @@ -2,9 +2,7 @@ require 'spec_helper' -RSpec.describe Projects::ImportExport::RelationExport, type: :model do - subject { create(:project_relation_export) } - +RSpec.describe Projects::ImportExport::RelationExport, type: :model, feature_category: :importers do describe 'associations' do it { is_expected.to belong_to(:project_export_job) } it { is_expected.to have_one(:upload) } @@ -13,12 +11,16 @@ RSpec.describe Projects::ImportExport::RelationExport, type: :model do describe 'validations' do it { is_expected.to validate_presence_of(:project_export_job) } it { is_expected.to validate_presence_of(:relation) } - it { is_expected.to validate_uniqueness_of(:relation).scoped_to(:project_export_job_id) } it { is_expected.to validate_presence_of(:status) } it { is_expected.to validate_numericality_of(:status).only_integer } it { is_expected.to validate_length_of(:relation).is_at_most(255) } it { is_expected.to validate_length_of(:jid).is_at_most(255) } it { is_expected.to validate_length_of(:export_error).is_at_most(300) } + + it 'validates uniquness of the relation attribute' do + create(:project_relation_export) + expect(subject).to validate_uniqueness_of(:relation).scoped_to(:project_export_job_id) + end end describe '.by_relation' do @@ -52,4 +54,16 @@ RSpec.describe Projects::ImportExport::RelationExport, type: :model do expect(described_class.relation_names_list).not_to include('events', 'notes') end end + + describe '#mark_as_failed' do + it 'sets status to failed and sets the export error', :aggregate_failures do + relation_export = create(:project_relation_export) + + relation_export.mark_as_failed("Error message") + relation_export.reload + + expect(relation_export.failed?).to eq(true) + expect(relation_export.export_error).to eq("Error message") + end + end end diff --git a/spec/services/projects/import_export/relation_export_service_spec.rb b/spec/services/projects/import_export/relation_export_service_spec.rb index cf9a0b50edf..4b44a37b299 100644 --- a/spec/services/projects/import_export/relation_export_service_spec.rb +++ b/spec/services/projects/import_export/relation_export_service_spec.rb @@ -49,6 +49,7 @@ RSpec.describe Projects::ImportExport::RelationExportService, feature_category: expect(logger).to receive(:error).with( export_error: '', message: 'Project relation export failed', + relation: relation_export.relation, project_export_job_id: project_export_job.id, project_id: project_export_job.project.id, project_name: project_export_job.project.name @@ -78,6 +79,7 @@ RSpec.describe Projects::ImportExport::RelationExportService, feature_category: expect(logger).to receive(:error).with( export_error: 'Error!', message: 'Project relation export failed', + relation: relation_export.relation, project_export_job_id: project_export_job.id, project_id: project_export_job.project.id, project_name: project_export_job.project.name diff --git a/spec/support/protected_tags/access_control_ce_shared_examples.rb b/spec/support/protected_tags/access_control_ce_shared_examples.rb index 8666c19481c..6aa9647bcec 100644 --- a/spec/support/protected_tags/access_control_ce_shared_examples.rb +++ b/spec/support/protected_tags/access_control_ce_shared_examples.rb @@ -6,18 +6,8 @@ RSpec.shared_examples "protected tags > access control > CE" do visit project_protected_tags_path(project) set_protected_tag_name('master') - - within('.js-new-protected-tag') do - allowed_to_create_button = find(".js-allowed-to-create") - - unless allowed_to_create_button.text == access_type_name - allowed_to_create_button.click - find('.create_access_levels-container .dropdown-menu li', match: :first) - within('.create_access_levels-container .dropdown-menu') { click_on access_type_name } - end - end - - click_on "Protect" + set_allowed_to('create', access_type_name) + click_on_protect expect(ProtectedTag.count).to eq(1) expect(ProtectedTag.last.create_access_levels.map(&:access_level)).to eq([access_type_id]) @@ -27,19 +17,12 @@ RSpec.shared_examples "protected tags > access control > CE" do visit project_protected_tags_path(project) set_protected_tag_name('master') - - click_on "Protect" + set_allowed_to('create', 'No one') + click_on_protect expect(ProtectedTag.count).to eq(1) - within(".protected-tags-list") do - find(".js-allowed-to-create").click - - within('.js-allowed-to-create-container') do - expect(first("li")).to have_content("Roles") - click_on access_type_name - end - end + set_allowed_to('create', access_type_name, form: '.protected-tags-list') wait_for_requests diff --git a/spec/support/shared_examples/features/protected_tags_with_deploy_keys_examples.rb b/spec/support/shared_examples/features/protected_tags_with_deploy_keys_examples.rb new file mode 100644 index 00000000000..cc0984b6226 --- /dev/null +++ b/spec/support/shared_examples/features/protected_tags_with_deploy_keys_examples.rb @@ -0,0 +1,61 @@ +# frozen_string_literal: true + +RSpec.shared_examples 'Deploy keys with protected tags' do + let(:dropdown_sections_minus_deploy_keys) { all_dropdown_sections - ['Deploy Keys'] } + + context 'when deploy keys are enabled to this project' do + let!(:deploy_key_1) { create(:deploy_key, title: 'title 1', projects: [project]) } + let!(:deploy_key_2) { create(:deploy_key, title: 'title 2', projects: [project]) } + + context 'when only one deploy key can push' do + before do + deploy_key_1.deploy_keys_projects.first.update!(can_push: true) + end + + it "shows all dropdown sections in the 'Allowed to create' main dropdown, with only one deploy key" do + visit project_protected_tags_path(project) + + find(".js-allowed-to-create").click + wait_for_requests + + within('[data-testid="allowed-to-create-dropdown"]') do + dropdown_headers = page.all('.dropdown-header').map(&:text) + + expect(dropdown_headers).to contain_exactly(*all_dropdown_sections) + expect(page).to have_content('title 1') + expect(page).not_to have_content('title 2') + end + end + + it "shows all sections in the 'Allowed to create' update dropdown" do + create(:protected_tag, :no_one_can_create, project: project, name: 'v1.0.0') + + visit project_protected_tags_path(project) + + within(".js-protected-tag-edit-form") do + find(".js-allowed-to-create").click + wait_for_requests + + dropdown_headers = page.all('.dropdown-header').map(&:text) + + expect(dropdown_headers).to contain_exactly(*all_dropdown_sections) + end + end + end + + context 'when no deploy key can push' do + it "just shows all sections but not deploy keys in the 'Allowed to create' dropdown" do + visit project_protected_tags_path(project) + + find(".js-allowed-to-create").click + wait_for_requests + + within('[data-testid="allowed-to-create-dropdown"]') do + dropdown_headers = page.all('.dropdown-header').map(&:text) + + expect(dropdown_headers).to contain_exactly(*dropdown_sections_minus_deploy_keys) + end + end + end + end +end diff --git a/spec/workers/projects/import_export/create_relation_exports_worker_spec.rb b/spec/workers/projects/import_export/create_relation_exports_worker_spec.rb new file mode 100644 index 00000000000..2ff91150fda --- /dev/null +++ b/spec/workers/projects/import_export/create_relation_exports_worker_spec.rb @@ -0,0 +1,67 @@ +# frozen_string_literal: true + +require 'spec_helper' + +RSpec.describe Projects::ImportExport::CreateRelationExportsWorker, feature_category: :importers do + let_it_be(:user) { build_stubbed(:user) } + let_it_be(:project) { create(:project) } + + let(:after_export_strategy) { {} } + let(:job_args) { [user.id, project.id, after_export_strategy] } + + before do + allow_next_instance_of(described_class) do |job| + allow(job).to receive(:jid) { SecureRandom.hex(8) } + end + end + + it_behaves_like 'an idempotent worker' + + context 'when job is re-enqueued after an interuption and same JID is used' do + before do + allow_next_instance_of(described_class) do |job| + allow(job).to receive(:jid).and_return(1234) + end + end + + it_behaves_like 'an idempotent worker' + + it 'does not start the export process twice' do + project.export_jobs.create!(jid: 1234, status_event: :start) + + expect { described_class.new.perform(user.id, project.id, after_export_strategy) } + .to change { Projects::ImportExport::WaitRelationExportsWorker.jobs.size }.by(0) + end + end + + it 'creates a export_job and sets the status to `started`' do + described_class.new.perform(user.id, project.id, after_export_strategy) + + export_job = project.export_jobs.last + expect(export_job.started?).to eq(true) + end + + it 'creates relation export records and enqueues a worker for each relation to be exported' do + allow(Projects::ImportExport::RelationExport).to receive(:relation_names_list).and_return(%w[relation_1 relation_2]) + + expect { described_class.new.perform(user.id, project.id, after_export_strategy) } + .to change { Projects::ImportExport::RelationExportWorker.jobs.size }.by(2) + + relation_exports = project.export_jobs.last.relation_exports + expect(relation_exports.collect(&:relation)).to match_array(%w[relation_1 relation_2]) + end + + it 'enqueues a WaitRelationExportsWorker' do + allow(Projects::ImportExport::WaitRelationExportsWorker).to receive(:perform_in) + + described_class.new.perform(user.id, project.id, after_export_strategy) + + export_job = project.export_jobs.last + expect(Projects::ImportExport::WaitRelationExportsWorker).to have_received(:perform_in).with( + described_class::INITIAL_DELAY, + export_job.id, + user.id, + after_export_strategy + ) + end +end diff --git a/spec/workers/projects/import_export/relation_export_worker_spec.rb b/spec/workers/projects/import_export/relation_export_worker_spec.rb index 7cd4e7afbe3..16ee73040b1 100644 --- a/spec/workers/projects/import_export/relation_export_worker_spec.rb +++ b/spec/workers/projects/import_export/relation_export_worker_spec.rb @@ -11,26 +11,61 @@ RSpec.describe Projects::ImportExport::RelationExportWorker, type: :worker, feat describe '#perform' do subject(:worker) { described_class.new } - context 'when relation export has initial state queued' do - let(:project_relation_export) { create(:project_relation_export) } + context 'when relation export has initial status `queued`' do + it 'exports the relation' do + expect_next_instance_of(Projects::ImportExport::RelationExportService) do |service| + expect(service).to receive(:execute) + end - it 'calls RelationExportService' do + worker.perform(project_relation_export.id) + end + end + + context 'when relation export has status `started`' do + let(:project_relation_export) { create(:project_relation_export, :started) } + + it 'retries the export of the relation' do expect_next_instance_of(Projects::ImportExport::RelationExportService) do |service| expect(service).to receive(:execute) end worker.perform(project_relation_export.id) + + expect(project_relation_export.reload.queued?).to eq(true) end end - context 'when relation export does not have queued state' do - let(:project_relation_export) { create(:project_relation_export, status_event: :start) } + context 'when relation export does not have status `queued` or `started`' do + let(:project_relation_export) { create(:project_relation_export, :finished) } - it 'does not call RelationExportService' do + it 'does not export the relation' do expect(Projects::ImportExport::RelationExportService).not_to receive(:new) worker.perform(project_relation_export.id) end end end + + describe '.sidekiq_retries_exhausted' do + let(:job) { { 'args' => [project_relation_export.id], 'error_message' => 'Error message' } } + + it 'sets relation export status to `failed`' do + described_class.sidekiq_retries_exhausted_block.call(job) + + expect(project_relation_export.reload.failed?).to eq(true) + end + + it 'logs the error message' do + expect_next_instance_of(Gitlab::Export::Logger) do |logger| + expect(logger).to receive(:error).with( + hash_including( + message: 'Project relation export failed', + export_error: 'Error message' + ) + ) + end + + described_class.sidekiq_retries_exhausted_block.call(job) + end + end end diff --git a/spec/workers/projects/import_export/wait_relation_exports_worker_spec.rb b/spec/workers/projects/import_export/wait_relation_exports_worker_spec.rb new file mode 100644 index 00000000000..52394b8998e --- /dev/null +++ b/spec/workers/projects/import_export/wait_relation_exports_worker_spec.rb @@ -0,0 +1,123 @@ +# frozen_string_literal: true + +require 'spec_helper' + +RSpec.describe Projects::ImportExport::WaitRelationExportsWorker, feature_category: :importers do + let_it_be(:user) { create(:user) } + let_it_be(:project_export_job) { create(:project_export_job, :started) } + + let(:after_export_strategy) { {} } + let(:job_args) { [project_export_job.id, user.id, after_export_strategy] } + + def create_relation_export(trait, relation, export_error = nil) + create(:project_relation_export, trait, + { project_export_job: project_export_job, relation: relation, export_error: export_error } + ) + end + + before do + allow_next_instance_of(described_class) do |job| + allow(job).to receive(:jid) { SecureRandom.hex(8) } + end + end + + context 'when export job status is not `started`' do + it 'does not perform any operation and finishes the worker' do + finished_export_job = create(:project_export_job, :finished) + + expect { described_class.new.perform(finished_export_job.id, user.id, after_export_strategy) } + .to change { Projects::ImportExport::ParallelProjectExportWorker.jobs.size }.by(0) + .and change { described_class.jobs.size }.by(0) + end + end + + context 'when there are relation exports with status `queued`' do + before do + create_relation_export(:finished, 'labels') + create_relation_export(:started, 'milestones') + create_relation_export(:queued, 'merge_requests') + end + + it 'does not enqueue ParallelProjectExportWorker and re-enqueue WaitRelationExportsWorker' do + expect { described_class.new.perform(*job_args) } + .to change { Projects::ImportExport::ParallelProjectExportWorker.jobs.size }.by(0) + .and change { described_class.jobs.size }.by(1) + end + end + + context 'when there are relation exports with status `started`' do + let(:started_relation_export) { create_relation_export(:started, 'releases') } + + before do + create_relation_export(:finished, 'labels') + create_relation_export(:queued, 'merge_requests') + end + + context 'when the Sidekiq Job exporting the relation is still running' do + it "does not change relation export's status and re-enqueue WaitRelationExportsWorker" do + allow(Gitlab::SidekiqStatus).to receive(:running?).with(started_relation_export.jid).and_return(true) + + expect { described_class.new.perform(*job_args) } + .to change { described_class.jobs.size }.by(1) + + expect(started_relation_export.reload.started?).to eq(true) + end + end + + context 'when the Sidekiq Job exporting the relation is still is no longer running' do + it "set the relation export's status to `failed`" do + allow(Gitlab::SidekiqStatus).to receive(:running?).with(started_relation_export.jid).and_return(false) + + expect { described_class.new.perform(*job_args) } + .to change { described_class.jobs.size }.by(1) + + expect(started_relation_export.reload.failed?).to eq(true) + end + end + end + + context 'when all relation exports have status `finished`' do + before do + create_relation_export(:finished, 'labels') + create_relation_export(:finished, 'issues') + end + + it 'enqueues ParallelProjectExportWorker and does not reenqueue WaitRelationExportsWorker' do + expect { described_class.new.perform(*job_args) } + .to change { Projects::ImportExport::ParallelProjectExportWorker.jobs.size }.by(1) + .and change { described_class.jobs.size }.by(0) + end + + it_behaves_like 'an idempotent worker' + end + + context 'when at least one relation export has status `failed` and the rest have status `finished` or `failed`' do + before do + create_relation_export(:finished, 'labels') + create_relation_export(:failed, 'issues', 'Failed to export issues') + create_relation_export(:failed, 'releases', 'Failed to export releases') + end + + it_behaves_like 'an idempotent worker' do + it 'notifies the failed exports to the user' do + expect_next_instance_of(NotificationService) do |notification_service| + expect(notification_service).to receive(:project_not_exported) + .with( + project_export_job.project, + user, + array_including(['Failed to export issues', 'Failed to export releases']) + ) + .once + end + + described_class.new.perform(*job_args) + end + end + + it 'does not enqueue ParallelProjectExportWorker and re-enqueue WaitRelationExportsWorker' do + expect { described_class.new.perform(*job_args) } + .to change { Projects::ImportExport::ParallelProjectExportWorker.jobs.size }.by(0) + .and change { described_class.jobs.size }.by(0) + end + end +end diff --git a/vendor/gems/cloud_profiler_agent/lib/cloud_profiler_agent/pprof_builder.rb b/vendor/gems/cloud_profiler_agent/lib/cloud_profiler_agent/pprof_builder.rb index 0f2ff71c791..a2ca3323d98 100644 --- a/vendor/gems/cloud_profiler_agent/lib/cloud_profiler_agent/pprof_builder.rb +++ b/vendor/gems/cloud_profiler_agent/lib/cloud_profiler_agent/pprof_builder.rb @@ -145,7 +145,7 @@ module CloudProfilerAgent @profile.fetch(:frames, []).each do |location_id, location| message.function.push(Perftools::Profiles::Function.new( id: location_id, - name: @string_map.add(location.fetch(:name)), + name: @string_map.add(cleaned_name(location.fetch(:name))), filename: @string_map.add(location.fetch(:file)), start_line: location.fetch(:line, nil) )) @@ -161,6 +161,13 @@ module CloudProfilerAgent )) end end + + def cleaned_name(name) + # Google Cloud Profiler has trouble identifying class structure in Ruby. It prefers everything separated by a + # dot as it is in for example Golang. + # We have to substitute `ActionView::Template#render` to `ActionView.Template.render` + name.gsub!(/::|#/, '.') || name + end end # The pprof format has one table of strings, and objects that need strings diff --git a/vendor/gems/cloud_profiler_agent/spec/cloud_profiler_agent/pprof_builder_spec.rb b/vendor/gems/cloud_profiler_agent/spec/cloud_profiler_agent/pprof_builder_spec.rb index 5c94a8e1e44..02d6a7a70c2 100644 --- a/vendor/gems/cloud_profiler_agent/spec/cloud_profiler_agent/pprof_builder_spec.rb +++ b/vendor/gems/cloud_profiler_agent/spec/cloud_profiler_agent/pprof_builder_spec.rb @@ -27,6 +27,25 @@ RSpec.describe CloudProfilerAgent::PprofBuilder, feature_category: :application_ # assertions about the message directly. let(:message) { subject.message } + context '#process_frames' do + let(:profile) { load_profile(:cpu) } + let(:string_map) { subject.instance_variable_get(:@string_map) } + + it 'converts method names to dot notation' do + original_frame_name = profile[:frames].to_a[0].last[:name] + expect(original_frame_name).to eq("Prime#prime_division") + second_original_frame_name = profile[:frames].to_a[1].last[:name] + expect(second_original_frame_name).to eq("Prime::PseudoPrimeGenerator#each") + + message + + cleaned_frame_name = string_map.strings[4] # the first 4 items are profile metadata + expect(cleaned_frame_name).to eq("Prime.prime_division") + second_cleaned_frame_name = string_map.strings[6] # 5 is the file location + expect(second_cleaned_frame_name).to eq("Prime.PseudoPrimeGenerator.each") + end + end + context 'with :cpu profile' do let(:profile) { load_profile(:cpu) } |