From 9fc7cdf0b7a3c8c3528ec930f59fde110683d8fd Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 6 Jul 2020 12:09:00 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../monitoring/components/dashboard.vue | 61 ++++++++++++- .../monitoring/components/dashboard_panel.vue | 44 +++++++++- .../javascripts/monitoring/constants.js | 14 +++ .../components/mr_widget_author.vue | 4 +- .../vue_merge_request_widget/index.js | 1 + app/controllers/application_controller.rb | 1 + .../controller_with_feature_category.rb | 45 ++++++++++ .../config.rb | 38 ++++++++ .../projects/merge_requests_controller.rb | 7 ++ .../update_alert_status_service.rb | 7 +- app/workers/concerns/worker_attributes.rb | 64 +++++--------- ...olve-todo-for-user-after-alert-resolve.yml | 5 ++ .../unreleased/225295-fix-missing-avatar.yml | 5 ++ ...d-keyboard-shortcuts-metrics-dashboard.yml | 5 ++ .../geo/replication/geo_validation_tests.md | 22 +++++ .../graphql/reference/gitlab_schema.graphql | 5 ++ doc/api/graphql/reference/gitlab_schema.json | 14 +++ doc/api/graphql/reference/index.md | 1 + doc/ci/variables/predefined_variables.md | 8 +- doc/ci/yaml/README.md | 10 +-- .../dast/img/dast_on_demand_v13_2.png | Bin 0 -> 91775 bytes doc/user/application_security/dast/index.md | 42 ++++++++- lib/gitlab/class_attributes.rb | 30 +++++++ lib/gitlab/metrics/web_transaction.rb | 6 +- .../config_spec.rb | 53 +++++++++++ .../controller_with_feature_category_spec.rb | 66 ++++++++++++++ spec/controllers/every_controller_spec.rb | 82 ++++++++++++++++++ .../monitoring/components/dashboard_spec.js | 28 ++++++ .../components/mr_widget_author_spec.js | 54 ++++++++---- .../mr_widget_auto_merge_enabled_spec.js | 9 ++ spec/lib/gitlab/class_attributes_spec.rb | 41 +++++++++ .../gitlab/metrics/web_transaction_spec.rb | 17 ++-- spec/requests/api/repositories_spec.rb | 16 +++- .../update_alert_status_service_spec.rb | 19 +++- 34 files changed, 736 insertions(+), 88 deletions(-) create mode 100644 app/controllers/concerns/controller_with_feature_category.rb create mode 100644 app/controllers/concerns/controller_with_feature_category/config.rb create mode 100644 changelogs/unreleased/216143-resolve-todo-for-user-after-alert-resolve.yml create mode 100644 changelogs/unreleased/225295-fix-missing-avatar.yml create mode 100644 changelogs/unreleased/jivanvl-add-keyboard-shortcuts-metrics-dashboard.yml create mode 100644 doc/user/application_security/dast/img/dast_on_demand_v13_2.png create mode 100644 lib/gitlab/class_attributes.rb create mode 100644 spec/controllers/concerns/controller_with_feature_category/config_spec.rb create mode 100644 spec/controllers/concerns/controller_with_feature_category_spec.rb create mode 100644 spec/controllers/every_controller_spec.rb create mode 100644 spec/lib/gitlab/class_attributes_spec.rb diff --git a/app/assets/javascripts/monitoring/components/dashboard.vue b/app/assets/javascripts/monitoring/components/dashboard.vue index a27c6aa0d1b..28c588de468 100644 --- a/app/assets/javascripts/monitoring/components/dashboard.vue +++ b/app/assets/javascripts/monitoring/components/dashboard.vue @@ -1,6 +1,7 @@