From ca05512007cea51e05d3431b2c8bd7228c754370 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 4 Feb 2020 18:08:50 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- README.md | 4 +- .../components/enable_review_app_button.vue | 107 +++++++ .../components/environments_app.vue | 26 +- .../environments/mixins/environments_mixin.js | 1 + .../environments/stores/environments_store.js | 6 + app/controllers/application_controller.rb | 8 - .../118844-one-button-review-app-fe.yml | 5 + ...line-to-cycle-analytics-duration-chart.yml | 5 + .../refactor-admin-mode-in-sidekiq-jobs.yml | 5 - doc/development/code_review.md | 6 + doc/development/migration_style_guide.md | 4 - doc/development/reactive_caching.md | 276 ++++++++++++++++++ doc/development/utilities.md | 275 +---------------- doc/user/analytics/cycle_analytics.md | 17 +- .../img/approvals_premium_mr_widget.png | Bin 22175 -> 0 bytes .../img/approvals_premium_mr_widget_v12_7.png | Bin 0 -> 198351 bytes .../img/mr_approvals_by_code_owners_v12_4.png | Bin 26902 -> 0 bytes .../img/mr_approvals_by_code_owners_v12_7.png | Bin 0 -> 88749 bytes .../merge_requests/merge_request_approvals.md | 6 +- lib/gitlab/auth/current_user_mode.rb | 61 +--- lib/gitlab/diff/highlight_cache.rb | 6 + lib/gitlab/sidekiq_middleware.rb | 2 - .../sidekiq_middleware/admin_mode/client.rb | 34 --- .../sidekiq_middleware/admin_mode/server.rb | 24 -- locale/gitlab.pot | 30 +- qa/qa/page/project/pipeline/show.rb | 4 +- .../create_and_process_pipeline_spec.rb | 104 ++++--- .../features/admin/admin_mode/workers_spec.rb | 77 ----- .../admin_uses_repository_checks_spec.rb | 72 ++--- .../enable_review_app_button_spec.js | 31 ++ .../environments/environments_app_spec.js | 20 ++ .../lib/gitlab/auth/current_user_mode_spec.rb | 176 +++-------- spec/lib/gitlab/diff/highlight_cache_spec.rb | 7 + .../admin_mode/client_spec.rb | 94 ------ .../admin_mode/server_spec.rb | 72 ----- spec/lib/gitlab/sidekiq_middleware_spec.rb | 6 +- spec/models/user_spec.rb | 6 +- spec/policies/base_policy_spec.rb | 10 +- .../discussion_comments_shared_example.rb | 45 ++- 39 files changed, 684 insertions(+), 948 deletions(-) create mode 100644 app/assets/javascripts/environments/components/enable_review_app_button.vue create mode 100644 changelogs/unreleased/118844-one-button-review-app-fe.yml create mode 100644 changelogs/unreleased/36675-add-median-line-to-cycle-analytics-duration-chart.yml delete mode 100644 changelogs/unreleased/refactor-admin-mode-in-sidekiq-jobs.yml create mode 100644 doc/development/reactive_caching.md delete mode 100644 doc/user/project/merge_requests/img/approvals_premium_mr_widget.png create mode 100644 doc/user/project/merge_requests/img/approvals_premium_mr_widget_v12_7.png delete mode 100644 doc/user/project/merge_requests/img/mr_approvals_by_code_owners_v12_4.png create mode 100644 doc/user/project/merge_requests/img/mr_approvals_by_code_owners_v12_7.png delete mode 100644 lib/gitlab/sidekiq_middleware/admin_mode/client.rb delete mode 100644 lib/gitlab/sidekiq_middleware/admin_mode/server.rb delete mode 100644 spec/features/admin/admin_mode/workers_spec.rb create mode 100644 spec/frontend/environments/enable_review_app_button_spec.js delete mode 100644 spec/lib/gitlab/sidekiq_middleware/admin_mode/client_spec.rb delete mode 100644 spec/lib/gitlab/sidekiq_middleware/admin_mode/server_spec.rb diff --git a/README.md b/README.md index b3b66959884..1372e47d52f 100644 --- a/README.md +++ b/README.md @@ -82,9 +82,9 @@ GitLab is a Ruby on Rails application that runs on the following software: - Ruby (MRI) 2.6.5 - Git 2.8.4+ - Redis 2.8+ -- PostgreSQL (preferred) or MySQL +- PostgreSQL 9.6+ -For more information please see the [architecture documentation](https://docs.gitlab.com/ce/development/architecture.html). +For more information please see the [architecture](https://docs.gitlab.com/ee/development/architecture.html) and [requirements](https://docs.gitlab.com/ee/install/requirements.html) documentation. ## UX design diff --git a/app/assets/javascripts/environments/components/enable_review_app_button.vue b/app/assets/javascripts/environments/components/enable_review_app_button.vue new file mode 100644 index 00000000000..2f9e9cb628f --- /dev/null +++ b/app/assets/javascripts/environments/components/enable_review_app_button.vue @@ -0,0 +1,107 @@ + + diff --git a/app/assets/javascripts/environments/components/environments_app.vue b/app/assets/javascripts/environments/components/environments_app.vue index 50c667e6966..07b8d20fde0 100644 --- a/app/assets/javascripts/environments/components/environments_app.vue +++ b/app/assets/javascripts/environments/components/environments_app.vue @@ -1,19 +1,23 @@