From 6d9c4dc2ef4c63bee8e9ca095dc2f0ed683a34f5 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 16 Nov 2020 18:09:15 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- GITALY_SERVER_VERSION | 2 +- .../javascripts/jobs/components/log/line.vue | 50 ++++-- app/assets/javascripts/jobs/utils.js | 4 + .../notes/components/note_actions.vue | 118 +++++++-------- .../components/note_actions/reply_button.vue | 2 +- .../pages/groups/clusters/destroy/index.js | 4 +- .../pages/groups/clusters/edit/index.js | 4 +- .../pages/groups/clusters/index.js | 6 +- .../pages/groups/clusters/index/index.js | 8 +- .../pages/groups/clusters/new/index.js | 4 +- .../pages/groups/clusters/show/index.js | 6 +- .../javascripts/pages/users/user_tabs.js | 17 ++- .../pipelines/components/dag/dag.vue | 21 ++- .../pipelines/pipeline_details_dag.js | 13 +- .../stylesheets/framework/calendar.scss | 14 +- app/assets/stylesheets/pages/groups.scss | 2 +- app/assets/stylesheets/pages/notes.scss | 23 ++- .../alerting/notifications_controller.rb | 2 - .../projects/avatars_controller.rb | 2 + app/controllers/projects/jobs_controller.rb | 3 + app/controllers/projects/raw_controller.rb | 2 + .../projects/repositories_controller.rb | 2 + .../alert_management/integrations_resolver.rb | 2 - app/graphql/types/issue_type.rb | 2 +- .../http_integrations/create_service.rb | 2 +- .../http_integrations/destroy_service.rb | 5 - .../http_integrations/update_service.rb | 5 - .../projects/alerting/notify_service.rb | 13 +- .../_package_registry.html.haml | 2 +- .../application_settings/ci_cd.html.haml | 4 +- .../groups/group_members/index.html.haml | 2 +- .../projects/pipelines/_with_tabs.html.haml | 4 +- app/views/users/_overview.html.haml | 16 +- .../235436-add-header-fuzzing-docs.yml | 5 + ...e-vue_group_members_list-ff-by-default.yml | 5 + ...ting-jira-tracker-data-deployment-type.yml | 5 + .../unreleased/249145-update-blank-dag.yml | 5 + changelogs/unreleased/283924-user-profile.yml | 5 + ...ache-raw-endpoints-for-logged-in-users.yml | 5 + .../sy-ff-removal-multiple-http-endpoints.yml | 5 + ...integrations.yml => ci_job_line_links.yml} | 8 +- .../usage_data_static_site_editor_commits.yml | 8 - ...data_static_site_editor_merge_requests.yml | 8 - .../development/vue_group_members_list.yml | 2 +- ..._backfill_jira_tracker_deployment_type2.rb | 32 ++++ db/schema_migrations/20201028182809 | 1 + .../geo/replication/configuration.md | 23 +-- .../replication/version_specific_updates.md | 2 +- .../graphql/reference/gitlab_schema.graphql | 4 +- doc/api/graphql/reference/gitlab_schema.json | 4 +- doc/api/graphql/reference/index.md | 4 +- doc/ci/directed_acyclic_graph/index.md | 16 +- doc/development/README.md | 9 +- doc/development/cached_queries.md | 139 +++++++++++++++++ doc/development/database/index.md | 4 + .../database/maintenance_operations.md | 46 ++++++ doc/development/fe_guide/droplab/droplab.md | 88 ++++++----- .../fe_guide/droplab/plugins/ajax.md | 22 +-- .../fe_guide/droplab/plugins/filter.md | 23 +-- .../fe_guide/droplab/plugins/index.md | 14 ++ .../fe_guide/droplab/plugins/input_setter.md | 32 ++-- doc/development/image_scaling.md | 96 ++++++++++++ .../img/performance_bar_cached_queries.png | Bin 0 -> 27039 bytes .../performance_bar_fixed_cached_queries.png | Bin 0 -> 8557 bytes .../img/performance_bar_members_page.png | Bin 0 -> 8437 bytes .../merge_request_performance_guidelines.md | 25 +-- doc/development/migration_style_guide.md | 6 + doc/development/performance.md | 34 +++++ doc/development/sidekiq_style_guide.md | 5 +- doc/integration/akismet.md | 31 ++-- doc/integration/auth0.md | 37 ++--- doc/integration/azure.md | 39 +++-- doc/integration/bitbucket.md | 66 ++++---- doc/topics/autodevops/customize.md | 4 +- doc/topics/autodevops/index.md | 4 +- doc/topics/autodevops/quick_start_guide.md | 4 +- doc/topics/autodevops/requirements.md | 4 +- doc/topics/autodevops/stages.md | 4 +- .../upgrading_auto_deploy_dependencies.md | 4 + doc/topics/autodevops/upgrading_postgresql.md | 4 +- .../analytics/instance_statistics.md | 24 ++- .../application_security/api_fuzzing/index.md | 80 ++++++++++ .../backfill_jira_tracker_deployment_type2.rb | 86 +++++++++++ lib/gitlab/middleware/read_only/controller.rb | 4 +- locale/gitlab.pot | 36 ++--- .../alerting/notifications_controller_spec.rb | 12 -- .../projects/avatars_controller_spec.rb | 34 +++-- .../projects/raw_controller_spec.rb | 9 ++ .../projects/repositories_controller_spec.rb | 4 +- .../projects/pipelines/pipeline_spec.rb | 4 +- .../frontend/jobs/components/log/line_spec.js | 143 ++++++++++++++++-- .../notes/components/note_actions_spec.js | 20 +-- .../integrations_resolver_spec.rb | 8 - ...fill_jira_tracker_deployment_type2_spec.rb | 65 ++++++++ ...fill_jira_tracker_deployment_type2_spec.rb | 38 +++++ .../http_integrations/create_service_spec.rb | 8 - .../http_integrations/destroy_service_spec.rb | 8 - .../http_integrations/update_service_spec.rb | 8 - .../projects/alerting/notify_service_spec.rb | 19 +-- ...ackground_migration_job_shared_examples.rb | 23 +++ ...ad_only_gitlab_instance_shared_examples.rb | 1 - 101 files changed, 1357 insertions(+), 534 deletions(-) create mode 100644 app/assets/javascripts/jobs/utils.js create mode 100644 changelogs/unreleased/235436-add-header-fuzzing-docs.yml create mode 100644 changelogs/unreleased/241194-enable-vue_group_members_list-ff-by-default.yml create mode 100644 changelogs/unreleased/243607-background-migration-for-setting-jira-tracker-data-deployment-type.yml create mode 100644 changelogs/unreleased/249145-update-blank-dag.yml create mode 100644 changelogs/unreleased/283924-user-profile.yml create mode 100644 changelogs/unreleased/cache-raw-endpoints-for-logged-in-users.yml create mode 100644 changelogs/unreleased/sy-ff-removal-multiple-http-endpoints.yml rename config/feature_flags/development/{multiple_http_integrations.yml => ci_job_line_links.yml} (69%) delete mode 100644 config/feature_flags/development/usage_data_static_site_editor_commits.yml delete mode 100644 config/feature_flags/development/usage_data_static_site_editor_merge_requests.yml create mode 100644 db/post_migrate/20201028182809_backfill_jira_tracker_deployment_type2.rb create mode 100644 db/schema_migrations/20201028182809 create mode 100644 doc/development/cached_queries.md create mode 100644 doc/development/database/maintenance_operations.md create mode 100644 doc/development/fe_guide/droplab/plugins/index.md create mode 100644 doc/development/image_scaling.md create mode 100644 doc/development/img/performance_bar_cached_queries.png create mode 100644 doc/development/img/performance_bar_fixed_cached_queries.png create mode 100644 doc/development/img/performance_bar_members_page.png create mode 100644 lib/gitlab/background_migration/backfill_jira_tracker_deployment_type2.rb create mode 100644 spec/lib/gitlab/background_migration/backfill_jira_tracker_deployment_type2_spec.rb create mode 100644 spec/migrations/20201028182809_backfill_jira_tracker_deployment_type2_spec.rb create mode 100644 spec/support/shared_examples/lib/gitlab/database/background_migration_job_shared_examples.rb diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 4862ceb7a20..f9ae25d2fb7 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -40d58655a42f71b6180a3cbaf369cc20b60e695a +2ecaa5afbef22c84b4ce31fcda2a246753a966a3 diff --git a/app/assets/javascripts/jobs/components/log/line.vue b/app/assets/javascripts/jobs/components/log/line.vue index e68d5b8eda4..c6fb3aeed1a 100644 --- a/app/assets/javascripts/jobs/components/log/line.vue +++ b/app/assets/javascripts/jobs/components/log/line.vue @@ -1,4 +1,6 @@