From d88ab3545c27cd674f5fb8bff5fb64a9eeed590f Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 17 May 2022 15:09:01 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../issue_templates/Feature Flag Roll Out.md | 1 - GITALY_SERVER_VERSION | 2 +- GITLAB_PAGES_VERSION | 2 +- app/assets/javascripts/api.js | 17 ++ .../components/secure_files_list.vue | 194 +++++++++++++++-- .../javascripts/ci_secure_files/index.js | 5 + .../list/components/issues_list_app.vue | 2 + app/assets/javascripts/issues/list/index.js | 2 + .../list/queries/get_issues.query.graphql | 1 + .../get_issues_without_crm.query.graphql | 1 + .../list/queries/issue.fragment.graphql | 4 +- .../javascripts/lib/utils/http_status.js | 1 + .../pipelines/components/header_component.vue | 16 +- .../list/components/issuable_item.vue | 15 +- app/controllers/projects/blame_controller.rb | 7 +- .../projects/ci/secure_files_controller.rb | 1 + .../mutations/work_items/delete_task.rb | 4 - .../design_management/designs_resolver.rb | 2 +- app/graphql/types/global_id_type.rb | 16 -- app/graphql/types/query_type.rb | 4 - app/helpers/issues_helper.rb | 2 + app/services/projects/blame_service.rb | 65 ++++++ app/views/projects/blame/show.html.haml | 3 + .../projects/ci/secure_files/show.html.haml | 4 +- .../development/blame_page_pagination.yml | 8 + .../development/updated_mr_header.yml | 2 +- .../004_zeitwerk.rb | 1 - doc/api/dora4_project_analytics.md | 2 +- doc/development/application_slis/index.md | 43 +++- doc/development/documentation/versions.md | 4 +- doc/tutorials/make_your_first_git_commit.md | 2 - .../img/create-new-issue_v14_3.png | Bin 4358 -> 0 bytes .../discussions/img/create-new-issue_v15.png | Bin 0 -> 5672 bytes .../img/unresolved_threads_v14_1.png | Bin 1540 -> 0 bytes .../img/unresolved_threads_v15.png | Bin 0 -> 2793 bytes doc/user/discussions/index.md | 7 +- doc/user/project/merge_requests/changes.md | 2 +- .../img/mr-diff-example_v14_8.png | Bin 17683 -> 0 bytes .../img/mr-diff-example_v15.png | Bin 0 -> 28658 bytes .../background_migration/job_coordinator.rb | 2 +- .../DAST-Default-Branch-Deploy.gitlab-ci.yml | 2 +- .../ci/templates/Jobs/Deploy.gitlab-ci.yml | 2 +- .../Jobs/Deploy.latest.gitlab-ci.yml | 2 +- lib/gitlab/database/migration_helpers.rb | 1 + .../restrict_gitlab_schema.rb | 6 +- .../background_migration_helpers.rb | 77 ++++--- .../reestablished_connection_stack.rb | 56 +++++ .../table_management_helpers.rb | 1 - .../gitlab_schemas_validate_connection.rb | 37 ++++ lib/gitlab/database/shared_model.rb | 6 +- lib/gitlab/graphql/global_id_compatibility.rb | 20 -- lib/gitlab/metrics/rails_slis.rb | 8 +- lib/gitlab/metrics/sli.rb | 63 ++++-- locale/gitlab.pot | 27 +++ .../ci/secure_files_controller_spec.rb | 34 ++- spec/factories/ci/secure_files.rb | 2 +- spec/features/projects/blobs/blame_spec.rb | 67 ++++++ .../features/projects/ci/secure_files_spec.rb | 46 +++- .../projects/tags/user_views_tags_spec.rb | 30 +++ spec/frontend/api_spec.js | 32 +++ .../components/secure_files_list_spec.js | 49 ++++- .../list/components/issues_list_app_spec.js | 20 ++ .../pipelines/header_component_spec.js | 51 ++++- spec/graphql/types/global_id_type_spec.rb | 125 ----------- spec/helpers/issues_helper_spec.rb | 1 + .../job_coordinator_spec.rb | 2 +- .../restrict_gitlab_schema_spec.rb | 45 +++- .../background_migration_helpers_spec.rb | 89 ++++++-- .../reestablished_connection_stack_spec.rb | 57 +++++ .../migrations/test_background_runner_spec.rb | 2 + ...gitlab_schemas_validate_connection_spec.rb | 70 +++++++ spec/lib/gitlab/database/shared_model_spec.rb | 2 +- spec/lib/gitlab/metrics/rails_slis_spec.rb | 14 +- spec/lib/gitlab/metrics/sli_spec.rb | 197 ++++++++++++------ spec/services/projects/blame_service_spec.rb | 129 ++++++++++++ spec/support/helpers/next_instance_of.rb | 8 +- ...lished_connection_stack_shared_examples.rb | 32 +++ spec/tooling/danger/project_helper_spec.rb | 9 + tooling/danger/project_helper.rb | 2 + 79 files changed, 1487 insertions(+), 380 deletions(-) create mode 100644 app/services/projects/blame_service.rb create mode 100644 config/feature_flags/development/blame_page_pagination.yml delete mode 100644 doc/user/discussions/img/create-new-issue_v14_3.png create mode 100644 doc/user/discussions/img/create-new-issue_v15.png delete mode 100644 doc/user/discussions/img/unresolved_threads_v14_1.png create mode 100644 doc/user/discussions/img/unresolved_threads_v15.png delete mode 100644 doc/user/project/merge_requests/img/mr-diff-example_v14_8.png create mode 100644 doc/user/project/merge_requests/img/mr-diff-example_v15.png create mode 100644 lib/gitlab/database/migrations/reestablished_connection_stack.rb create mode 100644 lib/gitlab/database/query_analyzers/gitlab_schemas_validate_connection.rb delete mode 100644 lib/gitlab/graphql/global_id_compatibility.rb create mode 100644 spec/features/projects/blobs/blame_spec.rb create mode 100644 spec/lib/gitlab/database/migrations/reestablished_connection_stack_spec.rb create mode 100644 spec/lib/gitlab/database/query_analyzers/gitlab_schemas_validate_connection_spec.rb create mode 100644 spec/services/projects/blame_service_spec.rb create mode 100644 spec/support/shared_examples/lib/gitlab/database/reestablished_connection_stack_shared_examples.rb diff --git a/.gitlab/issue_templates/Feature Flag Roll Out.md b/.gitlab/issue_templates/Feature Flag Roll Out.md index 910ec01a49c..52f189f09f0 100644 --- a/.gitlab/issue_templates/Feature Flag Roll Out.md +++ b/.gitlab/issue_templates/Feature Flag Roll Out.md @@ -176,4 +176,3 @@ You can either [create a follow-up issue for Feature Flag Cleanup](https://gitla ``` /label ~"feature flag" ~"type::feature" ~"feature::addition" -/assign DRI diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index a149f31c093..46ababbbca8 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -6b31501b13eae70aea5061edc8273c551ba4c349 +93762b621c011fe570339c1c247d5197c2cfefcc diff --git a/GITLAB_PAGES_VERSION b/GITLAB_PAGES_VERSION index 373aea97570..79f82f6b8e0 100644 --- a/GITLAB_PAGES_VERSION +++ b/GITLAB_PAGES_VERSION @@ -1 +1 @@ -1.57.0 +1.58.0 diff --git a/app/assets/javascripts/api.js b/app/assets/javascripts/api.js index e47c3e7bb55..8d46ea76be1 100644 --- a/app/assets/javascripts/api.js +++ b/app/assets/javascripts/api.js @@ -93,6 +93,7 @@ const Api = { groupNotificationSettingsPath: '/api/:version/groups/:id/notification_settings', notificationSettingsPath: '/api/:version/notification_settings', deployKeysPath: '/api/:version/deploy_keys', + secureFilePath: '/api/:version/projects/:project_id/secure_files/:secure_file_id', secureFilesPath: '/api/:version/projects/:project_id/secure_files', dependencyProxyPath: '/api/:version/groups/:id/dependency_proxy/cache', @@ -978,6 +979,22 @@ const Api = { return axios.get(url, { params: { per_page: DEFAULT_PER_PAGE, ...options } }); }, + uploadProjectSecureFile(projectId, fileData) { + const url = Api.buildUrl(this.secureFilesPath).replace(':project_id', projectId); + + const headers = { 'Content-Type': 'multipart/form-data' }; + + return axios.post(url, fileData, { headers }); + }, + + deleteProjectSecureFile(projectId, secureFileId) { + const url = Api.buildUrl(this.secureFilePath) + .replace(':project_id', projectId) + .replace(':secure_file_id', secureFileId); + + return axios.delete(url); + }, + async updateNotificationSettings(projectId, groupId, data = {}) { let url = Api.buildUrl(this.notificationSettingsPath); diff --git a/app/assets/javascripts/ci_secure_files/components/secure_files_list.vue b/app/assets/javascripts/ci_secure_files/components/secure_files_list.vue index 1283db5c8eb..dbc4565b19d 100644 --- a/app/assets/javascripts/ci_secure_files/components/secure_files_list.vue +++ b/app/assets/javascripts/ci_secure_files/components/secure_files_list.vue @@ -1,22 +1,48 @@