From effda22b3e6367cefd12666463b8409bf7e24cef Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 28 Sep 2020 12:10:02 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .rubocop_todo.yml | 1 - .../graph/stage_column_component.vue | 2 +- .../components/missing_prometheus.vue | 8 +- app/controllers/import/fogbugz_controller.rb | 2 +- app/controllers/import/github_controller.rb | 2 +- app/models/issue.rb | 5 + app/models/resource_label_event.rb | 11 + app/models/resource_state_event.rb | 25 ++ app/models/resource_timebox_event.rb | 15 + app/models/resource_weight_event.rb | 10 +- app/models/snippet_input_action_collection.rb | 6 +- .../pager_duty/process_webhook_service.rb | 2 +- app/services/lfs/push_service.rb | 16 +- app/services/snippets/create_service.rb | 2 +- app/services/snippets/update_service.rb | 4 +- ...get-lfs-push-mirror-working-for-github.yml | 5 + ...-counting-performance-of-the-last-port.yml | 5 + .../fix-pipeline-stage-action-alignment.yml | 5 + .../development/increased_diff_limits.yml | 4 +- .../limit_projects_in_groups_api.yml | 6 +- .../development/similarity_search.yml | 6 +- .../development/sql_set_operators.yml | 6 +- .../development/track_unique_visits.yml | 4 +- .../postgresql/replication_and_failover.md | 90 ++++++ doc/install/README.md | 3 + doc/install/aws/index.md | 3 + doc/install/docker.md | 3 + doc/install/google_cloud_platform/index.md | 3 + doc/install/installation.md | 3 + doc/install/openshift_and_gitlab/index.md | 4 +- doc/install/relative_url.md | 3 + doc/install/requirements.md | 3 + .../img/group_vulnerability_report_v13_4.png | Bin 42099 -> 136030 bytes ...ect_security_dashboard_dismissal_v13_4.png | Bin 0 -> 147574 bytes .../img/project_security_dashboard_v13_4.png | Bin 0 -> 155207 bytes .../img/vulnerability_list_table_v13_4.png | Bin 79904 -> 164629 bytes .../security_dashboard/index.md | 14 +- .../packages/composer_repository/index.md | 227 +++++++-------- doc/user/packages/package_registry/index.md | 2 +- .../backfill_snippet_repositories.rb | 2 +- lib/gitlab/database/with_lock_retries.rb | 8 +- lib/gitlab/lfs/client.rb | 37 ++- lib/gitlab/usage_data.rb | 10 +- .../issue_activity_unique_counter.rb | 46 ++- .../usage_data_counters/known_events.yml | 28 ++ lib/pager_duty/validator/schemas/message.json | 47 +++ lib/pager_duty/webhook_payload_parser.rb | 12 +- qa/qa/git/repository.rb | 4 + .../project_archive_compare_spec.rb | 7 + .../create_project_with_auto_devops_spec.rb | 4 +- spec/factories/usage_data.rb | 8 +- .../components/missing_prometheus_spec.js | 4 +- spec/helpers/gitlab_routing_helper_spec.rb | 4 +- .../lib/gitlab/ci/pipeline/seed/build_spec.rb | 10 +- .../lib/gitlab/cycle_analytics/events_spec.rb | 273 +++++------------- .../gitlab/database/with_lock_retries_spec.rb | 64 +++- spec/lib/gitlab/lfs/client_spec.rb | 99 ++++++- .../issue_activity_unique_counter_spec.rb | 40 +++ spec/lib/gitlab/usage_data_spec.rb | 2 +- .../pager_duty/webhook_payload_parser_spec.rb | 84 ++++-- spec/models/issue_spec.rb | 8 + spec/models/resource_label_event_spec.rb | 36 ++- spec/models/resource_milestone_event_spec.rb | 1 + spec/models/resource_state_event_spec.rb | 16 + spec/models/resource_weight_event_spec.rb | 10 + spec/models/snippet_input_action_spec.rb | 2 +- spec/services/lfs/push_service_spec.rb | 48 ++- spec/support/helpers/usage_data_helpers.rb | 2 +- .../resource_timebox_event_shared_examples.rb | 10 + 69 files changed, 970 insertions(+), 466 deletions(-) create mode 100644 changelogs/unreleased/250654-get-lfs-push-mirror-working-for-github.yml create mode 100644 changelogs/unreleased/251048-modify-time-period-for-batch-counting-performance-of-the-last-port.yml create mode 100644 changelogs/unreleased/fix-pipeline-stage-action-alignment.yml create mode 100644 doc/user/application_security/security_dashboard/img/project_security_dashboard_dismissal_v13_4.png create mode 100644 doc/user/application_security/security_dashboard/img/project_security_dashboard_v13_4.png create mode 100644 lib/pager_duty/validator/schemas/message.json diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 5d4473b6055..3a0390629a0 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -942,7 +942,6 @@ Rails/SaveBang: - 'spec/lib/gitlab/ci/ansi2json/style_spec.rb' - 'spec/lib/gitlab/ci/status/build/common_spec.rb' - 'spec/lib/gitlab/cycle_analytics/base_event_fetcher_spec.rb' - - 'spec/lib/gitlab/cycle_analytics/events_spec.rb' - 'spec/lib/gitlab/database/custom_structure_spec.rb' - 'spec/lib/gitlab/database/partitioning_migration_helpers/table_management_helpers_spec.rb' - 'spec/lib/gitlab/database_importers/self_monitoring/project/create_service_spec.rb' diff --git a/app/assets/javascripts/pipelines/components/graph/stage_column_component.vue b/app/assets/javascripts/pipelines/components/graph/stage_column_component.vue index 1453c349f44..a75ec585b95 100644 --- a/app/assets/javascripts/pipelines/components/graph/stage_column_component.vue +++ b/app/assets/javascripts/pipelines/components/graph/stage_column_component.vue @@ -71,7 +71,7 @@ export default { :action-icon="action.icon" :tooltip-text="action.title" :link="action.path" - class="js-stage-action stage-action position-absolute position-top-0 rounded" + class="js-stage-action stage-action rounded" @pipelineActionRequestComplete="pipelineActionRequestComplete" /> diff --git a/app/assets/javascripts/serverless/components/missing_prometheus.vue b/app/assets/javascripts/serverless/components/missing_prometheus.vue index 0d2c9f5151c..0b83d4b36eb 100644 --- a/app/assets/javascripts/serverless/components/missing_prometheus.vue +++ b/app/assets/javascripts/serverless/components/missing_prometheus.vue @@ -1,11 +1,11 @@