From 0eaa82ad61d2fda42b2dd5cf58cc08654b2d69ef Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 11 Sep 2020 12:08:50 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .rubocop.yml | 5 + .../components/sidebar/sidebar_todo.vue | 8 +- .../javascripts/alert_management/details.js | 9 +- .../incidents/components/incidents_list.vue | 16 + .../queries/get_incidents.query.graphql | 1 + .../stylesheets/page_bundles/todos.scss | 24 +- app/assets/stylesheets/themes/_dark.scss | 80 +++ app/controllers/search_controller.rb | 11 + app/finders/ci/jobs_finder.rb | 55 +- app/graphql/mutations/boards/destroy.rb | 37 ++ app/graphql/types/mutation_type.rb | 1 + app/models/ci/bridge.rb | 8 + app/models/ci/build.rb | 5 +- app/models/clusters/agent.rb | 2 + app/models/commit_status.rb | 2 + app/services/boards/destroy_service.rb | 8 +- .../concerns/merge_requests/removes_refs.rb | 9 + .../merge_requests/cleanup_refs_service.rb | 60 ++ app/services/merge_requests/close_service.rb | 3 + .../merge_requests/post_merge_service.rb | 3 + .../merge_requests/_how_to_merge.html.haml | 2 +- .../issuable/form/_type_selector.html.haml | 2 +- .../shared/milestones/_milestone.html.haml | 6 +- app/workers/all_queues.yml | 8 + .../merge_request_cleanup_refs_worker.rb | 23 + .../223156-remove-stale-mr-refs.yml | 5 + ...lose-Milestone-Button-is-Incorect-Size.yml | 5 + .../230980-severity-in-incident-list.yml | 5 + .../233455-destroy-board-graphql.yml | 5 + .../241970-fix-hover-style-in-darkmode.yml | 5 + changelogs/unreleased/app-logger-11.yml | 5 + .../block_anonymous_global_searches.yml | 7 + .../development/ci_jobs_finder_refactor.yml | 7 + config/sidekiq_queues.yml | 2 + doc/README.md | 2 +- doc/api/epic_links.md | 1 + .../graphql/reference/gitlab_schema.graphql | 106 +++ doc/api/graphql/reference/gitlab_schema.json | 321 ++++++++++ doc/api/graphql/reference/index.md | 11 + doc/development/telemetry/usage_ping.md | 9 +- doc/operations/feature_flags.md | 33 +- .../img/incident_list_sort_v13_3.png | Bin 39524 -> 0 bytes .../img/incident_list_v13_4.png | Bin 0 -> 16735 bytes .../incident_management/incidents.md | 8 +- .../img/group_vulnerability_report_v13_3.png | Bin 36339 -> 0 bytes .../img/group_vulnerability_report_v13_4.png | Bin 0 -> 42099 bytes .../security_dashboard/index.md | 2 +- .../reviewing_and_managing_merge_requests.md | 15 +- lib/api/ci/pipelines.rb | 91 +++ lib/api/jobs.rb | 48 -- lib/api/usage_data.rb | 1 + lib/gitlab/auth/ldap/adapter.rb | 4 +- lib/gitlab/shell.rb | 2 +- locale/gitlab.pot | 6 + qa/qa/page/main/sign_up.rb | 8 +- rubocop/cop/gitlab/rails_logger.rb | 35 +- spec/controllers/search_controller_spec.rb | 94 ++- .../issues/user_creates_issue_spec.rb | 4 + .../search/user_searches_for_issues_spec.rb | 33 +- .../search/user_searches_for_projects_spec.rb | 53 +- spec/finders/ci/jobs_finder_spec.rb | 146 ++++- spec/frontend/fixtures/search.rb | 6 + .../components/incidents_list_spec.js | 6 + spec/frontend/incidents/mocks/incidents.json | 12 +- spec/lib/gitlab/auth/ldap/adapter_spec.rb | 4 +- spec/models/clusters/agent_spec.rb | 11 + spec/requests/api/ci/pipelines_spec.rb | 601 ++++++++++++++++++ .../graphql/mutations/boards/destroy_spec.rb | 79 +++ spec/requests/api/jobs_spec.rb | 315 --------- spec/requests/api/usage_data_spec.rb | 12 + spec/rubocop/cop/gitlab/rails_logger_spec.rb | 26 +- .../cleanup_refs_service_spec.rb | 112 ++++ .../merge_requests/close_service_spec.rb | 6 + .../merge_requests/post_merge_service_spec.rb | 6 + .../ci/jobs_shared_examples.rb | 27 + .../merge_request_cleanup_refs_worker_spec.rb | 30 + 76 files changed, 2161 insertions(+), 559 deletions(-) create mode 100644 app/graphql/mutations/boards/destroy.rb create mode 100644 app/services/concerns/merge_requests/removes_refs.rb create mode 100644 app/services/merge_requests/cleanup_refs_service.rb create mode 100644 app/workers/merge_request_cleanup_refs_worker.rb create mode 100644 changelogs/unreleased/223156-remove-stale-mr-refs.yml create mode 100644 changelogs/unreleased/225393-Close-Milestone-Button-is-Incorect-Size.yml create mode 100644 changelogs/unreleased/230980-severity-in-incident-list.yml create mode 100644 changelogs/unreleased/233455-destroy-board-graphql.yml create mode 100644 changelogs/unreleased/241970-fix-hover-style-in-darkmode.yml create mode 100644 changelogs/unreleased/app-logger-11.yml create mode 100644 config/feature_flags/development/block_anonymous_global_searches.yml create mode 100644 config/feature_flags/development/ci_jobs_finder_refactor.yml delete mode 100644 doc/operations/incident_management/img/incident_list_sort_v13_3.png create mode 100644 doc/operations/incident_management/img/incident_list_v13_4.png delete mode 100644 doc/user/application_security/security_dashboard/img/group_vulnerability_report_v13_3.png create mode 100644 doc/user/application_security/security_dashboard/img/group_vulnerability_report_v13_4.png create mode 100644 spec/requests/api/graphql/mutations/boards/destroy_spec.rb create mode 100644 spec/services/merge_requests/cleanup_refs_service_spec.rb create mode 100644 spec/support/shared_examples/ci/jobs_shared_examples.rb create mode 100644 spec/workers/merge_request_cleanup_refs_worker_spec.rb diff --git a/.rubocop.yml b/.rubocop.yml index baaeab4ec6f..47dc85a79f0 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -543,3 +543,8 @@ Migration/CreateTableWithForeignKeys: # Disable this cop for all the existing migrations Exclude: - !ruby/regexp /\Adb\/(?:post_)?migrate\/(?:201[0-9]\d+|20200[0-8][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9])_.+\.rb\z/ + +Gitlab/RailsLogger: + Exclude: + - 'spec/**/*.rb' + - 'ee/spec/**/*.rb' diff --git a/app/assets/javascripts/alert_management/components/sidebar/sidebar_todo.vue b/app/assets/javascripts/alert_management/components/sidebar/sidebar_todo.vue index 2c6302e4f77..84d54466a10 100644 --- a/app/assets/javascripts/alert_management/components/sidebar/sidebar_todo.vue +++ b/app/assets/javascripts/alert_management/components/sidebar/sidebar_todo.vue @@ -1,4 +1,5 @@ @@ -348,6 +360,10 @@ export default { @row-clicked="navigateToIncidentDetails" @sort-changed="fetchSortedData" > + +