From bf1600d157465f9408aace91073954fd5790c054 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 16 Sep 2020 18:09:47 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .markdownlint.json | 1 + GITALY_SERVER_VERSION | 2 +- .../components/design_notes/design_note.vue | 2 +- .../repository/components/web_ide_link.vue | 47 -- app/assets/javascripts/repository/index.js | 28 +- .../vue_shared/components/actions_button.vue | 90 ++++ .../vue_shared/components/web_ide_link.vue | 118 +++++ app/assets/stylesheets/framework/buttons.scss | 10 + .../stylesheets/framework/dropdowns.scss | 14 + .../profiles/preferences_controller.rb | 1 + app/controllers/profiles_controller.rb | 1 + app/helpers/application_settings_helper.rb | 2 + app/helpers/preferences_helper.rb | 7 + app/helpers/tree_helper.rb | 34 +- app/models/application_setting.rb | 5 + .../application_setting_implementation.rb | 2 + app/models/ci/build_trace_chunk.rb | 8 + app/models/concerns/relative_positioning.rb | 398 ++------------ app/models/issue.rb | 13 +- app/models/project.rb | 4 - app/models/user.rb | 1 + app/models/vulnerability.rb | 17 + .../ci/create_job_artifacts_service.rb | 8 +- .../application_settings/_gitpod.html.haml | 30 ++ .../application_settings/general.html.haml | 1 + app/views/notify/_failed_builds.html.haml | 7 - .../notify/autodevops_disabled_email.text.erb | 3 - .../notify/pipeline_failed_email.text.erb | 4 - .../profiles/preferences/_gitpod.html.haml | 11 + .../preferences/_integrations.html.haml | 18 + .../preferences/_sourcegraph.html.haml | 36 +- app/views/profiles/preferences/show.html.haml | 2 +- .../projects/tree/_tree_header.html.haml | 13 +- .../gitpod/_enable_gitpod_modal.html.haml | 12 + bin/feature-flag | 16 +- ...create-vulnerability-placeholder-model.yml | 5 + .../237793-code-intelligence-usage-ping.yml | 5 + ...fix-daemon-jobs-hash-thread-safe-issue.yml | 5 + ...o-not-render-the-blockquotes-correctly.yml | 5 + ...itpod-button-to-open-project-in-gitpod.yml | 5 + .../ajk-relative-positioning-mover.yml | 5 + ...move-job-logs-from-notification-emails.yml | 5 + config/feature_flags/development/gitpod.yml | 7 + .../development/group_level_integrations.yml | 4 +- ...1154630_add_gitpod_application_settings.rb | 13 + ..._gitpod_application_settings_text_limit.rb | 16 + ...00811154632_add_gitpod_user_preferences.rb | 9 + db/schema_migrations/20200811154630 | 1 + db/schema_migrations/20200811154631 | 1 + db/schema_migrations/20200811154632 | 1 + db/structure.sql | 6 +- .../disaster_recovery/promotion_runbook.md | 269 ++++++++++ doc/administration/gitaly/praefect.md | 13 +- doc/api/users.md | 8 +- doc/development/README.md | 1 + doc/development/adding_service_component.md | 89 ++++ .../contributing/merge_request_workflow.md | 1 + doc/development/documentation/styleguide.md | 18 +- doc/development/feature_flags/development.md | 30 +- doc/development/geo/framework.md | 21 +- doc/development/redis.md | 147 +++++- doc/integration/gitpod.md | 74 +++ .../img/gitpod_button_project_page_v13_4.png | Bin 0 -> 25773 bytes .../img/gitpod_web_interface_v13_4.png | Bin 0 -> 99925 bytes .../offline_deployments/index.md | 6 +- doc/user/profile/preferences.md | 6 + doc/user/project/import/bitbucket_server.md | 7 +- .../reviewing_and_managing_merge_requests.md | 11 + .../project/settings/project_access_tokens.md | 5 +- doc/user/project/web_ide/index.md | 71 ++- lib/api/settings.rb | 5 + ...package_files_file_store_to_local_value.rb | 8 +- lib/gitlab/ci/trace/metrics.rb | 19 +- lib/gitlab/ci/trace/stream.rb | 8 +- lib/gitlab/consul/internal.rb | 11 +- lib/gitlab/gitpod.rb | 30 ++ lib/gitlab/prometheus/internal.rb | 4 + lib/gitlab/prometheus_client.rb | 15 +- lib/gitlab/relative_positioning.rb | 17 + lib/gitlab/relative_positioning/gap.rb | 21 + .../relative_positioning/item_context.rb | 259 ++++++++++ lib/gitlab/relative_positioning/mover.rb | 155 ++++++ lib/gitlab/relative_positioning/range.rb | 83 +++ lib/gitlab/sidekiq_daemon/memory_killer.rb | 6 +- lib/gitlab/sourcegraph.rb | 4 +- lib/gitlab/usage_data.rb | 2 - lib/gitlab/usage_data/topology.rb | 2 +- .../usage_data_counters/known_events.yml | 4 + lib/gitlab/utils/usage_data.rb | 30 +- locale/gitlab.pot | 39 +- qa/Dockerfile | 4 +- qa/qa/page/project/show.rb | 2 +- .../distinct_count_by_large_foreign_key.rb | 4 +- rubocop/rubocop-usage-data.yml | 19 +- spec/bin/feature_flag_spec.rb | 20 +- spec/features/admin/admin_settings_spec.rb | 29 ++ .../__snapshots__/design_note_spec.js.snap | 2 +- .../components/web_ide_link_spec.js | 51 -- .../components/actions_button_spec.js | 203 ++++++++ .../components/web_ide_link_spec.js | 106 ++++ spec/helpers/tree_helper_spec.rb | 88 +++- spec/lib/gitlab/ci/trace/stream_spec.rb | 22 + spec/lib/gitlab/consul/internal_spec.rb | 36 +- spec/lib/gitlab/gitpod_spec.rb | 66 +++ spec/lib/gitlab/prometheus/internal_spec.rb | 26 +- spec/lib/gitlab/prometheus_client_spec.rb | 22 + .../relative_positioning/item_context_spec.rb | 215 ++++++++ .../gitlab/relative_positioning/mover_spec.rb | 487 ++++++++++++++++++ .../gitlab/relative_positioning/range_spec.rb | 162 ++++++ .../sidekiq_daemon/memory_killer_spec.rb | 6 +- spec/lib/gitlab/usage_data/topology_spec.rb | 132 +++-- spec/lib/gitlab/utils/usage_data_spec.rb | 96 +++- spec/models/application_setting_spec.rb | 23 + spec/models/ci/build_trace_chunk_spec.rb | 37 ++ spec/models/design_management/design_spec.rb | 4 +- spec/models/issue_spec.rb | 27 +- spec/models/user_spec.rb | 3 + .../api/ci/runner/jobs_artifacts_spec.rb | 28 +- spec/requests/api/settings_spec.rb | 5 +- .../ci/update_build_state_service_spec.rb | 27 +- .../relative_positioning_shared_examples.rb | 359 +++---------- spec/tasks/gitlab/usage_data_rake_spec.rb | 9 +- ...autodevops_disabled_email.text.erb_spec.rb | 38 ++ 123 files changed, 3794 insertions(+), 1122 deletions(-) delete mode 100644 app/assets/javascripts/repository/components/web_ide_link.vue create mode 100644 app/assets/javascripts/vue_shared/components/actions_button.vue create mode 100644 app/assets/javascripts/vue_shared/components/web_ide_link.vue create mode 100644 app/models/vulnerability.rb create mode 100644 app/views/admin/application_settings/_gitpod.html.haml create mode 100644 app/views/profiles/preferences/_gitpod.html.haml create mode 100644 app/views/profiles/preferences/_integrations.html.haml create mode 100644 app/views/shared/gitpod/_enable_gitpod_modal.html.haml create mode 100644 changelogs/unreleased/222483-create-vulnerability-placeholder-model.yml create mode 100644 changelogs/unreleased/237793-code-intelligence-usage-ping.yml create mode 100644 changelogs/unreleased/249519-fix-daemon-jobs-hash-thread-safe-issue.yml create mode 100644 changelogs/unreleased/250350-design-comments-do-not-render-the-blockquotes-correctly.yml create mode 100644 changelogs/unreleased/37985-add-gitpod-button-to-open-project-in-gitpod.yml create mode 100644 changelogs/unreleased/ajk-relative-positioning-mover.yml create mode 100644 changelogs/unreleased/sh-remove-job-logs-from-notification-emails.yml create mode 100644 config/feature_flags/development/gitpod.yml create mode 100644 db/migrate/20200811154630_add_gitpod_application_settings.rb create mode 100644 db/migrate/20200811154631_add_gitpod_application_settings_text_limit.rb create mode 100644 db/migrate/20200811154632_add_gitpod_user_preferences.rb create mode 100644 db/schema_migrations/20200811154630 create mode 100644 db/schema_migrations/20200811154631 create mode 100644 db/schema_migrations/20200811154632 create mode 100644 doc/administration/geo/disaster_recovery/promotion_runbook.md create mode 100644 doc/development/adding_service_component.md create mode 100644 doc/integration/gitpod.md create mode 100644 doc/integration/img/gitpod_button_project_page_v13_4.png create mode 100644 doc/integration/img/gitpod_web_interface_v13_4.png create mode 100644 lib/gitlab/gitpod.rb create mode 100644 lib/gitlab/relative_positioning.rb create mode 100644 lib/gitlab/relative_positioning/gap.rb create mode 100644 lib/gitlab/relative_positioning/item_context.rb create mode 100644 lib/gitlab/relative_positioning/mover.rb create mode 100644 lib/gitlab/relative_positioning/range.rb delete mode 100644 spec/frontend/repository/components/web_ide_link_spec.js create mode 100644 spec/frontend/vue_shared/components/actions_button_spec.js create mode 100644 spec/frontend/vue_shared/components/web_ide_link_spec.js create mode 100644 spec/lib/gitlab/gitpod_spec.rb create mode 100644 spec/lib/gitlab/relative_positioning/item_context_spec.rb create mode 100644 spec/lib/gitlab/relative_positioning/mover_spec.rb create mode 100644 spec/lib/gitlab/relative_positioning/range_spec.rb create mode 100644 spec/views/notify/autodevops_disabled_email.text.erb_spec.rb diff --git a/.markdownlint.json b/.markdownlint.json index 5d81905d056..e548e03fe28 100644 --- a/.markdownlint.json +++ b/.markdownlint.json @@ -49,6 +49,7 @@ "Elasticsearch", "Facebook", "fastlane", + "fluent-plugin-redis-slowlog", "GDK", "Geo", "Git LFS", diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 0987715dbcd..b29d496a18a 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -ab2f2386ab69575cd0a58f7279be707a17d7a6c8 +b670554eae8643f2072d3b4f6f7c5cd2b9ec8776 diff --git a/app/assets/javascripts/design_management/components/design_notes/design_note.vue b/app/assets/javascripts/design_management/components/design_notes/design_note.vue index 18444a2cc2f..8498ba51644 100644 --- a/app/assets/javascripts/design_management/components/design_notes/design_note.vue +++ b/app/assets/javascripts/design_management/components/design_notes/design_note.vue @@ -123,7 +123,7 @@ export default {