From 6d43720a1a86ccca9618417a6d0415e7d522fa49 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 25 Oct 2019 00:06:14 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../components/add_request.vue | 48 ++++++++++++++ .../components/performance_bar_app.vue | 3 + .../javascripts/performance_bar/index.js | 14 ++++ app/assets/stylesheets/framework.scss | 2 +- app/assets/stylesheets/performance_bar.scss | 14 +++- app/controllers/application_controller.rb | 21 +----- .../registry/repositories_controller.rb | 2 +- app/helpers/sessions_helper.rb | 16 +++++ app/models/container_repository.rb | 2 +- .../container_repositories_serializer.rb | 4 ++ ...g-requests-to-performance-bar-manually.yml | 5 ++ .../fix_group_container_repositories_n_1.yml | 5 ++ .../sh-ensure-short-ttl-sessions.yml | 5 ++ .../performance/img/performance_bar.png | Bin 33642 -> 71317 bytes .../monitoring/performance/performance_bar.md | 11 ++-- doc/integration/README.md | 1 + ...rs_approval_new_protected_branch_v12_4.png | Bin ...owners_approval_protected_branch_v12_4.png | Bin .../img/mr_approvals_by_code_owners_v12_4.png | Bin doc/user/project/operations/error_tracking.md | 6 +- lib/gitlab/devise_failure.rb | 8 +++ locale/gitlab.pot | 6 ++ package.json | 2 +- .../features/users/anonymous_sessions_spec.rb | 41 ++++++++++++ .../components/add_request_spec.js | 62 ++++++++++++++++++ spec/javascripts/merge_request_spec.js | 3 +- spec/lib/gitlab/devise_failure_spec.rb | 35 ++++++++++ .../application_setting/term_policy_spec.rb | 2 + spec/policies/base_policy_spec.rb | 2 + spec/policies/ci/build_policy_spec.rb | 2 + spec/policies/ci/pipeline_policy_spec.rb | 2 + .../ci/pipeline_schedule_policy_spec.rb | 2 + spec/policies/ci/trigger_policy_spec.rb | 2 + spec/policies/clusters/cluster_policy_spec.rb | 2 + spec/policies/deploy_key_policy_spec.rb | 2 + spec/policies/deploy_token_policy_spec.rb | 2 + spec/policies/environment_policy_spec.rb | 2 + spec/policies/global_policy_spec.rb | 2 + spec/policies/group_policy_spec.rb | 2 + spec/policies/issuable_policy_spec.rb | 2 + spec/policies/issue_policy_spec.rb | 2 + spec/policies/merge_request_policy_spec.rb | 2 + spec/policies/namespace_policy_spec.rb | 2 + spec/policies/note_policy_spec.rb | 2 + spec/policies/personal_snippet_policy_spec.rb | 2 + spec/policies/project_policy_spec.rb | 2 + spec/policies/project_snippet_policy_spec.rb | 2 + spec/policies/protected_branch_policy_spec.rb | 2 + .../resource_label_event_policy_spec.rb | 2 + spec/policies/user_policy_spec.rb | 2 + .../registry/repositories_controller_spec.rb | 36 ++++++++++ yarn.lock | 8 +-- 52 files changed, 370 insertions(+), 36 deletions(-) create mode 100644 app/assets/javascripts/performance_bar/components/add_request.vue create mode 100644 changelogs/unreleased/allow-adding-requests-to-performance-bar-manually.yml create mode 100644 changelogs/unreleased/fix_group_container_repositories_n_1.yml create mode 100644 changelogs/unreleased/sh-ensure-short-ttl-sessions.yml mode change 100755 => 100644 doc/user/project/img/code_owners_approval_new_protected_branch_v12_4.png mode change 100755 => 100644 doc/user/project/img/code_owners_approval_protected_branch_v12_4.png mode change 100755 => 100644 doc/user/project/merge_requests/img/mr_approvals_by_code_owners_v12_4.png create mode 100644 spec/features/users/anonymous_sessions_spec.rb create mode 100644 spec/frontend/performance_bar/components/add_request_spec.js create mode 100644 spec/lib/gitlab/devise_failure_spec.rb create mode 100644 spec/requests/groups/registry/repositories_controller_spec.rb diff --git a/app/assets/javascripts/performance_bar/components/add_request.vue b/app/assets/javascripts/performance_bar/components/add_request.vue new file mode 100644 index 00000000000..54bca8a1b67 --- /dev/null +++ b/app/assets/javascripts/performance_bar/components/add_request.vue @@ -0,0 +1,48 @@ +import { __ } from '~/locale'; + + + diff --git a/app/assets/javascripts/performance_bar/components/performance_bar_app.vue b/app/assets/javascripts/performance_bar/components/performance_bar_app.vue index 3b07eba02b7..8ce653bf1fb 100644 --- a/app/assets/javascripts/performance_bar/components/performance_bar_app.vue +++ b/app/assets/javascripts/performance_bar/components/performance_bar_app.vue @@ -1,12 +1,14 @@