From 4f54ec92edd344449ee005fd4dd727fa2e3e3ffd Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 11 Aug 2021 15:10:57 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- GITALY_SERVER_VERSION | 2 +- .../components/confirm_rollback_modal.vue | 38 ++++-- .../components/rollback_modal_manager.vue | 7 +- .../components/details/app.vue | 26 +--- .../components/details/version_row.vue | 71 +++++++++++ .../package_registry/constants.js | 8 +- .../queries/get_package_details.query.graphql | 20 +++- .../security_configuration/index.js | 2 +- .../stylesheets/page_bundles/boards.scss | 19 +-- .../packages/dependency_link_metadata_type.rb | 23 ++++ .../nuget/dependency_link_metadatum_type.rb | 17 +++ .../packages/package_dependency_link_type.rb | 40 +++++++ .../types/packages/package_dependency_type.rb | 16 +++ .../packages/package_dependency_type_enum.rb | 13 ++ .../types/packages/package_details_type.rb | 2 + .../packages/dependency_link_policy.rb | 6 + .../nuget/dependency_link_metadatum_policy.rb | 8 ++ .../development/ci_same_stage_job_needs.yml | 2 +- ...50_rename_tables_ci_build_trace_section.rb | 11 ++ db/schema_migrations/20210809194250 | 1 + db/structure.sql | 97 +++++++-------- .../geo/replication/datatypes.md | 2 +- doc/administration/lfs/index.md | 4 +- .../postgresql/replication_and_failover.md | 57 +++++++++ doc/administration/troubleshooting/debug.md | 2 +- doc/api/graphql/reference/index.md | 95 +++++++++++++++ doc/ci/examples/deployment/index.md | 14 ++- doc/ci/yaml/index.md | 30 +---- .../documentation/styleguide/word_list.md | 2 +- .../end_to_end/best_practices.md | 10 ++ doc/user/project/merge_requests/changes.md | 12 +- .../merge_requests/img/merge_request_diff.png | Bin 26650 -> 0 bytes .../img/merge_request_diff_v14_2.png | Bin 0 -> 26430 bytes lib/gitlab/ci/config/entry/job.rb | 3 - locale/gitlab.pot | 5 +- .../api/1_manage/bulk_import_group_spec.rb | 4 +- .../api/1_manage/import_github_repo_spec.rb | 2 +- .../1_manage/import_large_github_repo_spec.rb | 2 +- .../kubernetes/kubernetes_integration_spec.rb | 2 +- .../support/matchers/eventually_matcher.rb | 17 +-- .../graphql/packages/package_details.json | 42 +++++++ ...ackage_nuget_dependency_link_metadata.json | 12 ++ .../confirm_rollback_modal_spec.js | 111 ++++++++++-------- .../__snapshots__/version_row_spec.js.snap | 101 ++++++++++++++++ .../components/details/app_spec.js | 39 ++++++ .../components/details/version_row_spec.js | 89 ++++++++++++++ .../package_registry/mock_data.js | 28 +++++ .../dependency_link_metdatum_type_spec.rb | 13 ++ .../package_dependency_link_type_spec.rb | 13 ++ .../package_dependency_type_enum_spec.rb | 9 ++ .../packages/package_dependency_type_spec.rb | 13 ++ .../packages/package_details_type_spec.rb | 2 +- spec/initializers/rails_asset_host_spec.rb | 9 ++ spec/lib/gitlab/ci/config/entry/job_spec.rb | 14 --- .../api/graphql/packages/nuget_spec.rb | 33 ++++++ .../requests/packages_shared_context.rb | 6 + 56 files changed, 997 insertions(+), 229 deletions(-) create mode 100644 app/assets/javascripts/packages_and_registries/package_registry/components/details/version_row.vue create mode 100644 app/graphql/types/packages/dependency_link_metadata_type.rb create mode 100644 app/graphql/types/packages/nuget/dependency_link_metadatum_type.rb create mode 100644 app/graphql/types/packages/package_dependency_link_type.rb create mode 100644 app/graphql/types/packages/package_dependency_type.rb create mode 100644 app/graphql/types/packages/package_dependency_type_enum.rb create mode 100644 app/policies/packages/dependency_link_policy.rb create mode 100644 app/policies/packages/nuget/dependency_link_metadatum_policy.rb create mode 100644 db/migrate/20210809194250_rename_tables_ci_build_trace_section.rb create mode 100644 db/schema_migrations/20210809194250 delete mode 100644 doc/user/project/merge_requests/img/merge_request_diff.png create mode 100644 doc/user/project/merge_requests/img/merge_request_diff_v14_2.png create mode 100644 spec/fixtures/api/schemas/graphql/packages/package_nuget_dependency_link_metadata.json create mode 100644 spec/frontend/packages_and_registries/package_registry/components/details/__snapshots__/version_row_spec.js.snap create mode 100644 spec/frontend/packages_and_registries/package_registry/components/details/version_row_spec.js create mode 100644 spec/graphql/types/packages/nuget/dependency_link_metdatum_type_spec.rb create mode 100644 spec/graphql/types/packages/package_dependency_link_type_spec.rb create mode 100644 spec/graphql/types/packages/package_dependency_type_enum_spec.rb create mode 100644 spec/graphql/types/packages/package_dependency_type_spec.rb diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 2b0daa89dfa..d9b9e1e8226 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -574ce1641f5de518338c2d4c7fbe17681d741363 +3ec72513ce59862f022cf5375f1d4739653f8cee diff --git a/app/assets/javascripts/environments/components/confirm_rollback_modal.vue b/app/assets/javascripts/environments/components/confirm_rollback_modal.vue index 58d9c428030..e7788e11ebe 100644 --- a/app/assets/javascripts/environments/components/confirm_rollback_modal.vue +++ b/app/assets/javascripts/environments/components/confirm_rollback_modal.vue @@ -6,7 +6,8 @@ import { GlModal } from '@gitlab/ui'; import { escape } from 'lodash'; -import { s__, sprintf } from '~/locale'; +import csrf from '~/lib/utils/csrf'; +import { __, s__, sprintf } from '~/locale'; import eventHub from '../event_hub'; @@ -35,6 +36,11 @@ export default { required: false, default: true, }, + retryUrl: { + type: String, + required: false, + default: null, + }, }, computed: { @@ -66,6 +72,12 @@ export default { return this.environment.commitUrl; }, + modalActionText() { + return this.environment.isLastDeployment + ? s__('Environments|Re-deploy') + : s__('Environments|Rollback'); + }, + modalText() { const linkStart = ``; const commitId = escape(this.commitShortSha); @@ -90,10 +102,17 @@ export default { ); }, - modalActionText() { - return this.environment.isLastDeployment - ? s__('Environments|Re-deploy') - : s__('Environments|Rollback'); + primaryProps() { + let attributes = [{ variant: 'danger' }]; + + if (this.retryUrl) { + attributes = [...attributes, { 'data-method': 'post' }, { href: this.retryUrl }]; + } + + return { + text: this.modalActionText, + attributes, + }; }, }, @@ -114,15 +133,20 @@ export default { return ''; }, }, + csrf, + cancelProps: { + text: __('Cancel'), + attributes: [{ variant: 'danger' }], + }, };