From ea0085de54590ffde24fee2ced286961a419410d Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 30 Apr 2021 09:10:21 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab/ci/docs.gitlab-ci.yml | 4 +- .rubocop_manual_todo.yml | 1 - .rubocop_todo.yml | 1 - CHANGELOG.md | 7 + GITALY_SERVER_VERSION | 2 +- .../components/recovery_codes.vue | 10 +- .../pipelines/charts/components/app.vue | 6 +- .../releases/components/tag_field_new.vue | 17 +- .../grouped_codequality_reports_app.vue | 18 -- .../codequality_report/store/actions.js | 31 +-- .../codequality_report/store/mutations.js | 3 - ...ty_comparison.js => codequality_parser.js} | 16 -- .../workers/codequality_comparison_worker.js | 28 --- .../mr_widget_options.vue | 3 - .../labels_select_vue/dropdown_contents.vue | 12 +- .../dropdown_contents_labels_view.vue | 13 +- .../sidebar/labels_select_vue/label_item.vue | 12 +- .../labels_select_vue/labels_select_root.vue | 6 +- app/assets/stylesheets/pages/editor.scss | 26 ++- .../requires_whitelisted_monitoring_client.rb | 2 +- app/controllers/groups/runners_controller.rb | 1 - app/controllers/projects/hooks_controller.rb | 1 + app/controllers/projects/issues_controller.rb | 17 +- .../projects/runners_controller.rb | 1 - app/helpers/groups_helper.rb | 2 + app/helpers/projects_helper.rb | 2 + .../project_services/webex_teams_service.rb | 17 +- app/services/issues/update_service.rb | 3 +- app/views/admin/dashboard/index.html.haml | 2 +- app/views/admin/health_check/show.html.haml | 6 +- app/views/admin/hook_logs/_index.html.haml | 2 +- app/views/admin/runners/show.html.haml | 4 +- app/views/groups/runners/edit.html.haml | 5 +- app/views/groups/runners/show.html.haml | 3 + app/views/layouts/header/_default.html.haml | 2 +- .../layouts/nav/sidebar/_group.html.haml | 2 +- .../nav/sidebar/_project_menus.html.haml | 2 +- app/views/projects/_commit_button.html.haml | 4 +- app/views/projects/blob/_editor.html.haml | 20 +- app/views/projects/hook_logs/_index.html.haml | 2 +- app/views/projects/new.html.haml | 11 +- app/views/projects/runners/edit.html.haml | 5 +- app/views/projects/runners/show.html.haml | 3 + ...ow.html.haml => _runner_details.html.haml} | 39 ++-- .../snippets/_snippets_scope_menu.html.haml | 8 +- .../273316-update-edit-file-buttons.yml | 5 + ...-undefined-method-any-for-nil-nilclass.yml | 5 + ...-on-specific-runners-page-is-confusing.yml | 5 + ...factor-webex-integration-settings-text.yml | 5 + .../fix-admin-integrations-foss.yml | 5 - changelogs/unreleased/gl-badge-snippets.yml | 5 + ...iend-fix-substring-tag-on-release-page.yml | 5 + .../unreleased/sy-change-issue-type.yml | 5 + .../unreleased/yogi-gl-card-billing.yml | 5 + .../yogi-gl-card-recovery-codes.yml | 5 + .../unreleased/yogi-health-check-gl-card.yml | 5 + .../yogi-hide-templates-buttons.yml | 5 + .../unreleased/yogi-question-o-admin.yml | 5 + .../unreleased/yogi-question-o-navbar.yml | 5 + doc/administration/gitaly/configure_gitaly.md | 8 +- .../img/housekeeping_settings.png | Bin 24754 -> 0 bytes .../lfs/img/git-annex-branches.png | Bin 32164 -> 0 bytes doc/ci/pipelines/img/pipelines_v13_11.png | Bin 28783 -> 0 bytes doc/development/api_graphql_styleguide.md | 23 +++ doc/topics/git/lfs/img/git-annex-branches.png | Bin 32164 -> 0 bytes doc/user/analytics/ci_cd_analytics.md | 9 +- .../img/emails_on_push_service.png | Bin 81786 -> 0 bytes doc/user/project/integrations/webex_teams.md | 19 +- ...orking_workflow_choose_namespace_v13_2.png | Bin 29612 -> 0 bytes lib/api/helpers/services_helpers.rb | 2 +- locale/gitlab.pot | 32 +++- scripts/lint-doc.sh | 2 +- .../projects/hooks_controller_spec.rb | 56 +++++- .../projects/issues_controller_spec.rb | 15 +- .../issues/resource_label_events_spec.rb | 2 +- .../pipelines/charts/components/app_spec.js | 20 +- .../releases/components/tag_field_new_spec.js | 72 ++++--- .../grouped_codequality_reports_app_spec.js | 16 +- .../reports/codequality_report/mock_data.js | 91 --------- .../codequality_report/store/actions_spec.js | 179 +++++------------- .../store/mutations_spec.js | 12 +- .../utils/codequality_comparison_spec.js | 153 --------------- .../store/utils/codequality_parser_spec.js | 74 ++++++++ .../dropdown_contents_spec.js | 17 +- .../labels_select_root_spec.js | 54 +++--- spec/services/issues/update_service_spec.rb | 10 +- ...c.rb => _runner_details.html.haml_spec.rb} | 8 +- 87 files changed, 605 insertions(+), 721 deletions(-) rename app/assets/javascripts/reports/codequality_report/store/utils/{codequality_comparison.js => codequality_parser.js} (61%) delete mode 100644 app/assets/javascripts/reports/codequality_report/workers/codequality_comparison_worker.js create mode 100644 app/views/groups/runners/show.html.haml create mode 100644 app/views/projects/runners/show.html.haml rename app/views/shared/runners/{show.html.haml => _runner_details.html.haml} (51%) create mode 100644 changelogs/unreleased/273316-update-edit-file-buttons.yml create mode 100644 changelogs/unreleased/320982-actionview-template-error-undefined-method-any-for-nil-nilclass.yml create mode 100644 changelogs/unreleased/32551-link-to-breadcrumbs-on-specific-runners-page-is-confusing.yml create mode 100644 changelogs/unreleased/eread-refactor-webex-integration-settings-text.yml delete mode 100644 changelogs/unreleased/fix-admin-integrations-foss.yml create mode 100644 changelogs/unreleased/gl-badge-snippets.yml create mode 100644 changelogs/unreleased/nfriend-fix-substring-tag-on-release-page.yml create mode 100644 changelogs/unreleased/sy-change-issue-type.yml create mode 100644 changelogs/unreleased/yogi-gl-card-billing.yml create mode 100644 changelogs/unreleased/yogi-gl-card-recovery-codes.yml create mode 100644 changelogs/unreleased/yogi-health-check-gl-card.yml create mode 100644 changelogs/unreleased/yogi-hide-templates-buttons.yml create mode 100644 changelogs/unreleased/yogi-question-o-admin.yml create mode 100644 changelogs/unreleased/yogi-question-o-navbar.yml delete mode 100644 doc/administration/img/housekeeping_settings.png delete mode 100644 doc/administration/lfs/img/git-annex-branches.png delete mode 100644 doc/ci/pipelines/img/pipelines_v13_11.png delete mode 100644 doc/topics/git/lfs/img/git-annex-branches.png delete mode 100644 doc/user/project/integrations/img/emails_on_push_service.png delete mode 100644 doc/user/project/repository/img/forking_workflow_choose_namespace_v13_2.png delete mode 100644 spec/frontend/reports/codequality_report/store/utils/codequality_comparison_spec.js create mode 100644 spec/frontend/reports/codequality_report/store/utils/codequality_parser_spec.js rename spec/views/shared/runners/{show.html.haml_spec.rb => _runner_details.html.haml_spec.rb} (93%) diff --git a/.gitlab/ci/docs.gitlab-ci.yml b/.gitlab/ci/docs.gitlab-ci.yml index 8f70127be65..f6ab7492c07 100644 --- a/.gitlab/ci/docs.gitlab-ci.yml +++ b/.gitlab/ci/docs.gitlab-ci.yml @@ -44,7 +44,7 @@ docs-lint markdown: - .default-retry - .docs:rules:docs-lint # When updating the image version here, update it in /scripts/lint-doc.sh too. - image: "registry.gitlab.com/gitlab-org/gitlab-docs/lint-markdown:alpine-3.12-vale-2.8.0-markdownlint-0.26.0" + image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-markdown:alpine-3.13-vale-2.10.2-markdownlint-0.26.0 stage: test needs: [] script: @@ -54,7 +54,7 @@ docs-lint links: extends: - .default-retry - .docs:rules:docs-lint - image: "registry.gitlab.com/gitlab-org/gitlab-docs/lint-html:alpine-3.12-ruby-2.7.2" + image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-html:alpine-3.13-ruby-2.7.2 stage: test needs: [] script: diff --git a/.rubocop_manual_todo.yml b/.rubocop_manual_todo.yml index 4203803904a..1438814728f 100644 --- a/.rubocop_manual_todo.yml +++ b/.rubocop_manual_todo.yml @@ -1366,7 +1366,6 @@ RSpec/AnyInstanceOf: - 'spec/uploaders/workers/object_storage/migrate_uploads_worker_spec.rb' - 'spec/views/layouts/_head.html.haml_spec.rb' - 'spec/views/projects/artifacts/_artifact.html.haml_spec.rb' - - 'spec/views/shared/runners/show.html.haml_spec.rb' - 'spec/workers/archive_trace_worker_spec.rb' - 'spec/workers/build_coverage_worker_spec.rb' - 'spec/workers/build_hooks_worker_spec.rb' diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 85d5a58007c..64332dfc0ce 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -600,7 +600,6 @@ Rails/ShortI18n: Exclude: - 'app/models/project_services/chat_message/pipeline_message.rb' - 'app/uploaders/content_type_whitelist.rb' - - 'spec/views/shared/runners/show.html.haml_spec.rb' # Offense count: 1144 # Configuration parameters: ForbiddenMethods, AllowedMethods. diff --git a/CHANGELOG.md b/CHANGELOG.md index f272dd674ac..79d8c52461a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 13.11.3 (2021-04-30) + +### Fixed (1 change) + +- Fix Instance-level Project Integration Management page for GitLab FOSS. !60354 + + ## 13.11.2 (2021-04-27) ### Security (5 changes) diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 25fad78ed09..5d1508b5ea8 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -8128ec05cf75d8af4f0b4e422106cef4adf9b3a4 +46f08adbf4930f6a9c56f37ef5e4106c5b50810f diff --git a/app/assets/javascripts/authentication/two_factor_auth/components/recovery_codes.vue b/app/assets/javascripts/authentication/two_factor_auth/components/recovery_codes.vue index 55642aa64db..4f9f6fb25c6 100644 --- a/app/assets/javascripts/authentication/two_factor_auth/components/recovery_codes.vue +++ b/app/assets/javascripts/authentication/two_factor_auth/components/recovery_codes.vue @@ -1,5 +1,5 @@