From 87f286558de1f5790b0b1742f10548387b5d147a Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 14 May 2020 15:08:14 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab/ci/global.gitlab-ci.yml | 4 - .gitlab/ci/rails.gitlab-ci.yml | 33 +++- .markdownlint.json | 1 + GITLAB_SHELL_VERSION | 2 +- .../edit/components/integration_form.vue | 8 + .../edit/components/trigger_fields.vue | 73 ++++++++ .../javascripts/integrations/edit/index.js | 3 +- .../monitoring/components/dashboard.vue | 30 ++++ app/assets/javascripts/repository/router.js | 21 ++- .../components/edit_area.vue | 9 +- app/controllers/graphql_controller.rb | 7 + .../projects/static_site_editor_controller.rb | 4 - app/models/milestone_note.rb | 2 +- app/models/namespace/root_storage_size.rb | 8 - app/serializers/service_event_entity.rb | 44 +++++ app/serializers/service_event_serializer.rb | 5 + .../issuable/common_system_notes_service.rb | 18 +- app/services/issuable_base_service.rb | 6 +- .../namespaces/check_storage_size_service.rb | 64 +++++-- app/services/post_receive_service.rb | 15 ++ .../change_milestone_service.rb | 7 +- app/views/projects/services/_form.html.haml | 4 +- app/views/projects/services/edit.html.haml | 1 + app/views/shared/_milestone_expired.html.haml | 6 +- app/views/shared/_service_settings.html.haml | 18 +- .../unreleased/213566-deploy-token-npm.yml | 5 + .../unreleased/214581-star-dashboard-btn.yml | 6 + .../215121-add-wysiwyg-documentation.yml | 5 + ...---app-views-shared-_milestone_expired.yml | 5 + .../unreleased/37278-DS_DISABLE_DIND-true.yml | 5 + .../37278-SAST_DISABLE_DIND-true.yml | 5 + .../graphql_log_user_last_activity_on.yml | 5 + ...frenkel-remove-pipfilelock-from-ds-tpl.yml | 5 + config/environments/test.rb | 3 +- doc/.vale/gitlab/Substitutions.yml | 1 + .../geo/disaster_recovery/index.md | 3 +- .../geo/replication/configuration.md | 2 +- .../geo/replication/external_database.md | 13 +- .../geo/replication/geo_validation_tests.md | 100 ++++++----- .../geo/replication/security_review.md | 2 +- .../geo/replication/troubleshooting.md | 2 + .../high_availability/database.md | 2 +- .../troubleshooting/postgresql.md | 8 +- doc/api/users.md | 1 + doc/development/code_review.md | 2 +- doc/development/pipelines.md | 4 +- doc/integration/jenkins.md | 5 + doc/user/instance_statistics/user_cohorts.md | 1 + doc/user/packages/npm_registry/index.md | 17 +- .../img/static_site_editor_v12_10.png | Bin 50679 -> 0 bytes .../img/wysiwyg_editor_v13_0.png | Bin 0 -> 49012 bytes doc/user/project/static_site_editor/index.md | 8 +- lib/gitlab/auth/auth_finders.rb | 10 +- .../Dependency-Scanning.gitlab-ci.yml | 3 +- .../ci/templates/Security/SAST.gitlab-ci.yml | 2 +- lib/gitlab/danger/teammate.rb | 31 +++- lib/gitlab/task_helpers.rb | 8 +- lib/gitlab/utils.rb | 4 +- .../app/hashed_storage_all_projects_check.rb | 2 +- lib/tasks/gitlab/gitaly.rake | 2 +- lib/tasks/gitlab/shell.rake | 2 +- lib/tasks/gitlab/workhorse.rake | 2 +- locale/gitlab.pot | 21 ++- scripts/gitaly_test.rb | 2 +- scripts/prepare_build.sh | 9 +- scripts/utils.sh | 35 +++- spec/controllers/graphql_controller_spec.rb | 15 +- spec/factories/services.rb | 7 + spec/features/admin/admin_settings_spec.rb | 18 +- .../projects/files/user_browses_files_spec.rb | 27 +++ .../edit/components/active_toggle_spec.js | 5 +- .../edit/components/integration_form_spec.js | 18 ++ .../components/jira_trigger_fields_spec.js | 5 +- .../edit/components/trigger_fields_spec.js | 136 +++++++++++++++ .../dashboard_template_spec.js.snap | 20 +++ .../monitoring/components/dashboard_spec.js | 79 ++++++++- .../components/edit_area_spec.js | 3 - spec/lib/gitlab/auth/auth_finders_spec.rb | 18 ++ spec/lib/gitlab/danger/teammate_spec.rb | 13 +- spec/lib/gitlab/utils_spec.rb | 27 ++- spec/models/milestone_note_spec.rb | 10 ++ .../namespace/root_storage_size_spec.rb | 18 -- spec/serializers/service_event_entity_spec.rb | 41 +++++ .../custom_config_content_spec.rb | 4 +- .../merge_requests/update_service_spec.rb | 1 + .../check_storage_size_service_spec.rb | 161 ++++++++++++------ spec/services/post_receive_service_spec.rb | 35 ++++ .../change_milestone_service_spec.rb | 10 +- spec/spec_helper.rb | 4 +- spec/support/helpers/test_env.rb | 18 +- .../project_service_shared_context.rb | 1 + ...hange_milestone_service_shared_examples.rb | 7 +- spec/tasks/gitlab/gitaly_rake_spec.rb | 2 +- spec/tasks/gitlab/task_helpers_spec.rb | 15 +- spec/tasks/gitlab/workhorse_rake_spec.rb | 2 +- .../projects/services/_form.haml_spec.rb | 2 + 96 files changed, 1169 insertions(+), 294 deletions(-) create mode 100644 app/assets/javascripts/integrations/edit/components/trigger_fields.vue create mode 100644 app/serializers/service_event_entity.rb create mode 100644 app/serializers/service_event_serializer.rb create mode 100644 changelogs/unreleased/213566-deploy-token-npm.yml create mode 100644 changelogs/unreleased/214581-star-dashboard-btn.yml create mode 100644 changelogs/unreleased/215121-add-wysiwyg-documentation.yml create mode 100644 changelogs/unreleased/22691-externelize-i18n-strings-from---app-views-shared-_milestone_expired.yml create mode 100644 changelogs/unreleased/37278-DS_DISABLE_DIND-true.yml create mode 100644 changelogs/unreleased/37278-SAST_DISABLE_DIND-true.yml create mode 100644 changelogs/unreleased/graphql_log_user_last_activity_on.yml create mode 100644 changelogs/unreleased/ifrenkel-remove-pipfilelock-from-ds-tpl.yml delete mode 100644 doc/user/project/static_site_editor/img/static_site_editor_v12_10.png create mode 100644 doc/user/project/static_site_editor/img/wysiwyg_editor_v13_0.png create mode 100644 spec/frontend/integrations/edit/components/trigger_fields_spec.js create mode 100644 spec/serializers/service_event_entity_spec.rb diff --git a/.gitlab/ci/global.gitlab-ci.yml b/.gitlab/ci/global.gitlab-ci.yml index 341fa131876..d64475691c2 100644 --- a/.gitlab/ci/global.gitlab-ci.yml +++ b/.gitlab/ci/global.gitlab-ci.yml @@ -46,8 +46,6 @@ - name: redis:alpine variables: POSTGRES_HOST_AUTH_METHOD: trust - cache: - key: "debian-stretch-ruby-2.6.6-pg11-node-12.x" .use-pg11-ee: image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.6-golang-1.14-git-2.26-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34" @@ -58,8 +56,6 @@ - name: elasticsearch:6.4.2 variables: POSTGRES_HOST_AUTH_METHOD: trust - cache: - key: "debian-stretch-ruby-2.6.6-pg11-node-12.x" # Pin kaniko to v0.16.0 due to https://github.com/GoogleContainerTools/kaniko/issues/1162 .use-kaniko: diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index a361274ab97..3a78ef97d20 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -1,11 +1,20 @@ .rails:needs:setup-and-assets: needs: ["setup-test-env", "compile-assets pull-cache"] +.rails-cache: + cache: + key: "ruby-go-cache-v1" + paths: + - vendor/ruby + - vendor/gitaly-ruby + - .go/pkg/mod + policy: pull + .rails-job-base: extends: - .default-retry - - .default-cache - .default-before_script + - .rails-cache ####################################################### # EE/FOSS: default refs (MRs, master, schedules) jobs # @@ -13,15 +22,25 @@ extends: - .rails-job-base stage: prepare + variables: + GITLAB_TEST_EAGER_LOAD: "0" script: - - bundle exec ruby -Ispec -e 'require "spec_helper" ; TestEnv.init' - - scripts/gitaly-test-build # Do not use 'bundle exec' here + - run_timed_command "bundle exec ruby -I. -e 'require \"config/environment\"; TestEnv.init'" + - run_timed_command "scripts/gitaly-test-build" # Do not use 'bundle exec' here artifacts: expire_in: 7d paths: - - tmp/tests - config/secrets.yml - - vendor/gitaly-ruby + - tmp/tests/gitaly + - tmp/tests/gitlab-elasticsearch-indexer + - tmp/tests/gitlab-shell + - tmp/tests/gitlab-test-fork + - tmp/tests/gitlab-test-fork_bare + - tmp/tests/gitlab-test + - tmp/tests/gitlab-workhorse + - tmp/tests/repositories + - tmp/tests/second_storage + when: always cache: policy: pull-push @@ -52,8 +71,8 @@ static-analysis: downtime_check: extends: - .rails-job-base - - .rails:needs:setup-and-assets - .rails:rules:downtime_check + needs: ["setup-test-env"] stage: test variables: SETUP_DB: "false" @@ -176,7 +195,7 @@ gitlab:setup: # db/fixtures/development/04_project.rb thanks to SIZE=1 below - git clone https://gitlab.com/gitlab-org/gitlab-test.git /home/git/repositories/gitlab-org/gitlab-test.git - - scripts/gitaly-test-spawn + - run_timed_command "scripts/gitaly-test-spawn" - force=yes SIZE=1 FIXTURE_PATH="db/fixtures/development" bundle exec rake gitlab:setup artifacts: when: on_failure diff --git a/.markdownlint.json b/.markdownlint.json index 79bd06991e7..88e3d5f7759 100644 --- a/.markdownlint.json +++ b/.markdownlint.json @@ -46,6 +46,7 @@ "Elasticsearch", "Facebook", "GDK", + "Geo", "Git LFS", "git-annex", "Git", diff --git a/GITLAB_SHELL_VERSION b/GITLAB_SHELL_VERSION index 685332623b2..67aee23940e 100644 --- a/GITLAB_SHELL_VERSION +++ b/GITLAB_SHELL_VERSION @@ -1 +1 @@ -12.2.0 +13.2.0 diff --git a/app/assets/javascripts/integrations/edit/components/integration_form.vue b/app/assets/javascripts/integrations/edit/components/integration_form.vue index ab6a3f97bfd..fbe58c30b13 100644 --- a/app/assets/javascripts/integrations/edit/components/integration_form.vue +++ b/app/assets/javascripts/integrations/edit/components/integration_form.vue @@ -1,12 +1,14 @@ + + diff --git a/app/assets/javascripts/integrations/edit/index.js b/app/assets/javascripts/integrations/edit/index.js index 7b476528a33..2ae1342a558 100644 --- a/app/assets/javascripts/integrations/edit/index.js +++ b/app/assets/javascripts/integrations/edit/index.js @@ -15,7 +15,7 @@ export default el => { return result; } - const { type, commentDetail, ...booleanAttributes } = el.dataset; + const { type, commentDetail, triggerEvents, ...booleanAttributes } = el.dataset; const { showActive, activated, @@ -40,6 +40,7 @@ export default el => { initialEnableComments: enableComments, initialCommentDetail: commentDetail, }, + triggerEvents: JSON.parse(triggerEvents), }, }); }, diff --git a/app/assets/javascripts/monitoring/components/dashboard.vue b/app/assets/javascripts/monitoring/components/dashboard.vue index 27ef0b0999e..02f4e26ba3b 100644 --- a/app/assets/javascripts/monitoring/components/dashboard.vue +++ b/app/assets/javascripts/monitoring/components/dashboard.vue @@ -226,6 +226,7 @@ export default { 'environmentsLoading', 'expandedPanel', 'promVariables', + 'isUpdatingStarredValue', ]), ...mapGetters('monitoringDashboard', ['getMetricStates', 'filteredEnvironments']), firstDashboard() { @@ -312,6 +313,7 @@ export default { 'filterEnvironments', 'setExpandedPanel', 'clearExpandedPanel', + 'toggleStarredValue', ]), updatePanels(key, panels) { this.setPanelGroupMetrics({ @@ -422,6 +424,8 @@ export default { }, i18n: { goBackLabel: s__('Metrics|Go back (Esc)'), + starDashboard: s__('Metrics|Star dashboard'), + unstarDashboard: s__('Metrics|Unstar dashboard'), }, }; @@ -518,6 +522,32 @@ export default {
+
+ +
+ + + +
+
+
({ + path: route.params.path?.replace(/^\//, '') || '/', + }), + }; + return new VueRouter({ mode: 'history', base: joinPaths(gon.relative_url_root || '', base), routes: [ { - path: `(/-)?/tree/${baseRef}/:path*`, + name: 'treePathDecoded', + // Sometimes the ref needs decoding depending on how the backend sends it to us + path: `(/-)?/tree/${decodeURI(baseRef)}/:path*`, + ...treePathRoute, + }, + { name: 'treePath', - component: TreePage, - props: route => ({ - path: route.params.path?.replace(/^\//, '') || '/', - }), + // Support without decoding as well just in case the ref doesn't need to be decoded + path: `(/-)?/tree/${baseRef}/:path*`, + ...treePathRoute, }, { path: '/', diff --git a/app/assets/javascripts/static_site_editor/components/edit_area.vue b/app/assets/javascripts/static_site_editor/components/edit_area.vue index aafa5a2d0ba..3957547556c 100644 --- a/app/assets/javascripts/static_site_editor/components/edit_area.vue +++ b/app/assets/javascripts/static_site_editor/components/edit_area.vue @@ -1,20 +1,14 @@