From a898b6057ecf9ab635c45217568d44eab5c32ec0 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 15 Jul 2020 09:09:34 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab/CODEOWNERS | 11 +- Gemfile | 4 +- Gemfile.lock | 4 +- .../boards/components/boards_selector.vue | 2 +- .../jobs/components/manual_variables_form.vue | 8 +- .../monitoring/components/dashboard.vue | 21 +- .../components/dashboard_header.vue | 9 +- .../monitoring/components/empty_state.vue | 67 +++-- .../monitoring/components/graph_group.vue | 17 +- .../monitoring/stores/mutation_types.js | 1 - .../monitoring/stores/mutations.js | 12 +- .../javascripts/monitoring/stores/state.js | 7 +- .../notes/components/comment_form.vue | 2 +- .../notes/components/note_form.vue | 2 +- .../components/release_block_header.vue | 2 +- .../components/grouped_test_reports_app.vue | 7 +- .../confidential/edit_form_buttons.vue | 2 +- .../components/lock/edit_form_buttons.vue | 2 +- .../states/mr_widget_auto_merge_enabled.vue | 6 +- .../mr_widget_options.vue | 2 +- .../project_selector/project_list_item.vue | 2 +- app/assets/stylesheets/framework/common.scss | 1 - .../stylesheets/framework/variables.scss | 2 +- app/assets/stylesheets/pages/runners.scss | 3 +- app/graphql/mutations/notes/create/base.rb | 8 +- app/graphql/mutations/snippets/create.rb | 4 +- app/graphql/mutations/snippets/update.rb | 4 +- app/helpers/environments_helper.rb | 17 +- app/presenters/clusters/cluster_presenter.rb | 2 + .../concerns/incident_management/settings.rb | 2 + .../create_incident_issue_service.rb | 72 ++++++ app/services/snippets/base_service.rb | 16 +- app/services/snippets/create_service.rb | 6 +- app/services/snippets/update_service.rb | 8 +- app/views/admin/runners/_runner.html.haml | 4 +- app/views/ci/group_variables/_index.html.haml | 4 +- .../_variable_header.html.haml | 4 +- .../_environment_scope_header.html.haml | 2 +- .../ci/variables/_variable_header.html.haml | 6 +- .../active_sessions/_active_session.html.haml | 2 +- app/views/profiles/gpg_keys/_key.html.haml | 2 +- app/views/profiles/keys/_key.html.haml | 6 +- app/views/profiles/passwords/edit.html.haml | 2 +- .../two_factor_auths/_codes.html.haml | 2 +- .../profiles/two_factor_auths/show.html.haml | 2 +- app/views/projects/blob/_editor.html.haml | 4 +- .../projects/commit/_commit_box.html.haml | 4 +- app/views/projects/issues/_nav_btns.html.haml | 2 +- .../merge_requests/_discussion.html.haml | 2 +- .../merge_requests/_nav_btns.html.haml | 2 +- .../projects/mirrors/_ssh_host_keys.html.haml | 2 +- app/views/projects/no_repo.html.haml | 2 +- .../_pipeline_schedule.html.haml | 4 +- .../_built_in_templates.html.haml | 4 +- .../_project_fields_form.html.haml | 2 +- .../sent_notifications/unsubscribe.html.haml | 4 +- app/views/shared/groups/_dropdown.html.haml | 2 +- app/views/shared/issuable/_form.html.haml | 2 +- .../milestones/_deprecation_message.html.haml | 2 +- .../shared/notes/_comment_button.html.haml | 2 +- app/views/shared/projects/_project.html.haml | 4 +- app/workers/all_queues.yml | 16 +- .../pager_duty/process_incident_worker.rb | 42 +++ ...7473-create-confidential-notes-graphql.yml | 5 + ...17758-reduce-metrics-dashboard-loading.yml | 6 + .../unreleased/225933-fa-play-replacement.yml | 5 + .../unreleased/sh-update-grape-1-4-0.yml | 5 + .../unreleased/test-report-link-fix.yml | 5 + config/initializers/grape_patch.rb | 31 +++ doc/.vale/gitlab/AlertBoxStyle.yml | 13 + doc/administration/auth/ldap/index.md | 2 +- .../reference_architectures/2k_users.md | 2 +- doc/administration/uploads.md | 2 +- doc/api/boards.md | 2 +- doc/api/epics.md | 2 +- doc/api/feature_flags.md | 2 +- .../graphql/reference/gitlab_schema.graphql | 15 ++ doc/api/graphql/reference/gitlab_schema.json | 30 +++ doc/api/issues.md | 6 +- doc/api/merge_requests.md | 2 +- doc/api/releases/links.md | 2 +- doc/ci/README.md | 6 +- doc/ci/docker/using_docker_build.md | 2 +- doc/ci/environments/protected_environments.md | 2 +- doc/ci/introduction/index.md | 6 +- doc/ci/merge_request_pipelines/index.md | 2 +- doc/ci/pipelines/settings.md | 2 +- doc/ci/yaml/README.md | 2 +- doc/development/changelog.md | 7 +- doc/development/documentation/styleguide.md | 2 +- doc/development/elasticsearch.md | 5 +- doc/install/aws/index.md | 6 +- doc/integration/elasticsearch.md | 4 +- doc/integration/jira_development_panel.md | 6 +- doc/migrate_ci_to_ce/README.md | 2 +- doc/operations/metrics/index.md | 2 +- doc/policy/maintenance.md | 2 +- doc/raketasks/backup_restore.md | 24 +- doc/topics/autodevops/index.md | 2 +- doc/topics/autodevops/stages.md | 2 +- doc/topics/web_application_firewall/index.md | 4 +- doc/update/upgrading_from_ce_to_ee.md | 2 +- .../settings/continuous_integration.md | 4 +- .../configuration/index.md | 2 +- doc/user/application_security/dast/index.md | 6 +- .../img/security_configuration_page_v13_1.png | Bin 199472 -> 0 bytes .../img/security_configuration_page_v13_2.png | Bin 0 -> 51691 bytes doc/user/application_security/sast/index.md | 6 +- doc/user/packages/conan_repository/index.md | 8 +- .../project/clusters/add_remove_clusters.md | 8 +- doc/user/project/clusters/index.md | 2 +- .../project/clusters/kubernetes_pod_logs.md | 4 +- doc/user/project/code_owners.md | 2 +- .../project/integrations/generic_alerts.md | 2 +- .../integrations/jira_cloud_configuration.md | 2 +- .../integrations/jira_server_configuration.md | 2 +- .../index.md | 2 +- .../reducing_the_repo_size_using_git.md | 2 +- lib/api/helpers.rb | 2 +- .../pager_duty/incident_issue_description.rb | 64 +++++ lib/gitlab/instrumentation/redis_base.rb | 3 - lib/gitlab/usage_data.rb | 2 +- lib/pager_duty/webhook_payload_parser.rb | 66 +++++ lib/peek/views/elasticsearch.rb | 2 +- locale/gitlab.pot | 20 +- spec/factories/projects.rb | 7 + .../pager_duty/webhook_incident_trigger.json | 239 ++++++++++++++++++ .../dashboard_template_spec.js.snap | 4 - .../__snapshots__/empty_state_spec.js.snap | 78 +++--- .../monitoring/components/dashboard_spec.js | 39 ++- .../monitoring/components/empty_state_spec.js | 20 +- .../monitoring/components/graph_group_spec.js | 138 +++++----- .../components/links_section_spec.js | 2 +- .../components/variables_section_spec.js | 4 +- .../monitoring/store/mutations_spec.js | 27 -- .../grouped_test_reports_app_spec.js | 1 + spec/helpers/environments_helper_spec.rb | 24 ++ .../incident_issue_description_spec.rb | 97 +++++++ .../pager_duty/webhook_payload_parser_spec.rb | 80 ++++++ .../clusters/cluster_presenter_spec.rb | 2 + .../mutations/notes/create/note_spec.rb | 4 +- .../graphql/mutations/snippets/create_spec.rb | 2 +- .../create_incident_issue_service_spec.rb | 104 ++++++++ spec/services/snippets/create_service_spec.rb | 24 +- spec/services/snippets/update_service_spec.rb | 68 ++--- .../process_incident_worker_spec.rb | 57 +++++ symbol/icons.svg | 1 - symbol/sprite.symbol.html | 177 ------------- 148 files changed, 1498 insertions(+), 614 deletions(-) create mode 100644 app/services/incident_management/pager_duty/create_incident_issue_service.rb create mode 100644 app/workers/incident_management/pager_duty/process_incident_worker.rb create mode 100644 changelogs/unreleased/207473-create-confidential-notes-graphql.yml create mode 100644 changelogs/unreleased/217758-reduce-metrics-dashboard-loading.yml create mode 100644 changelogs/unreleased/225933-fa-play-replacement.yml create mode 100644 changelogs/unreleased/sh-update-grape-1-4-0.yml create mode 100644 changelogs/unreleased/test-report-link-fix.yml create mode 100644 config/initializers/grape_patch.rb create mode 100644 doc/.vale/gitlab/AlertBoxStyle.yml delete mode 100644 doc/user/application_security/img/security_configuration_page_v13_1.png create mode 100644 doc/user/application_security/img/security_configuration_page_v13_2.png create mode 100644 lib/gitlab/incident_management/pager_duty/incident_issue_description.rb create mode 100644 lib/pager_duty/webhook_payload_parser.rb create mode 100644 spec/fixtures/pager_duty/webhook_incident_trigger.json create mode 100644 spec/lib/gitlab/incident_management/pager_duty/incident_issue_description_spec.rb create mode 100644 spec/lib/pager_duty/webhook_payload_parser_spec.rb create mode 100644 spec/services/incident_management/pager_duty/create_incident_issue_service_spec.rb create mode 100644 spec/workers/incident_management/pager_duty/process_incident_worker_spec.rb delete mode 100644 symbol/icons.svg delete mode 100644 symbol/sprite.symbol.html diff --git a/.gitlab/CODEOWNERS b/.gitlab/CODEOWNERS index 79e4d4925f1..4e2c4aa5c76 100644 --- a/.gitlab/CODEOWNERS +++ b/.gitlab/CODEOWNERS @@ -50,11 +50,6 @@ /ee/app/models/project_alias.rb @patrickbajao /ee/lib/api/project_aliases.rb @patrickbajao -# Code Owners -# -/ee/lib/gitlab/code_owners/ @reprazent @kerrizor @garyh -/doc/user/project/code_owners.md @reprazent @kerrizor @garyh - # Quality owned files /qa/ @gl-quality @@ -78,3 +73,9 @@ Dangerfile @gl-quality/eng-prod /lib/gitlab/usage_data.rb @gitlab-org/growth/telemetry /lib/gitlab/cycle_analytics/usage_data.rb @gitlab-org/growth/telemetry /lib/gitlab/usage_data_counters/ @gitlab-org/growth/telemetry + +[Code Owners] +/ee/lib/gitlab/code_owners.rb @reprazent @kerrizor @garyh +/ee/lib/gitlab/code_owners/ @reprazent @kerrizor @garyh +/ee/spec/lib/gitlab/code_owners/ @reprazent @kerrizor @garyh +/doc/user/project/code_owners.md @reprazent @kerrizor @garyh diff --git a/Gemfile b/Gemfile index 2bfc9d69660..e69cf8c2dce 100644 --- a/Gemfile +++ b/Gemfile @@ -81,7 +81,9 @@ gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap' gem 'net-ldap' # API -gem 'grape', '~> 1.3.3' +# Locked at Grape v1.4.0 until https://github.com/ruby-grape/grape/pull/2088 is merged +# Remove config/initializers/grape_patch.rb +gem 'grape', '= 1.4.0' gem 'grape-entity', '~> 0.7.1' gem 'rack-cors', '~> 1.0.6', require: 'rack/cors' diff --git a/Gemfile.lock b/Gemfile.lock index ffd39ac85ed..c1ea8ab4e1e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -453,7 +453,7 @@ GEM signet (~> 0.14) gpgme (2.0.20) mini_portile2 (~> 2.3) - grape (1.3.3) + grape (1.4.0) activesupport builder dry-types (>= 1.1) @@ -1269,7 +1269,7 @@ DEPENDENCIES google-api-client (~> 0.33) google-protobuf (~> 3.8.0) gpgme (~> 2.0.19) - grape (~> 1.3.3) + grape (= 1.4.0) grape-entity (~> 0.7.1) grape-path-helpers (~> 1.3) grape_logging (~> 1.7) diff --git a/app/assets/javascripts/boards/components/boards_selector.vue b/app/assets/javascripts/boards/components/boards_selector.vue index 80db9930259..dbe3e0790f6 100644 --- a/app/assets/javascripts/boards/components/boards_selector.vue +++ b/app/assets/javascripts/boards/components/boards_selector.vue @@ -233,7 +233,7 @@ export default {