From 5c635722c66a32e170c3ba8150bc303124abb7a1 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 14 Oct 2020 21:08:38 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../components/alert_management_table.vue | 2 +- .../repository/components/breadcrumbs.vue | 26 ++--- .../stylesheets/page_bundles/boards.scss | 60 +++++------ .../stylesheets/page_bundles/milestone.scss | 14 +-- app/helpers/mirror_helper.rb | 6 +- .../projects/update_remote_mirror_service.rb | 1 - ...ove-push-mirror-syncs-lfs-feature-flag.yml | 5 + ...257762-boards-page-broken-on-dark-mode.yml | 5 + ...64-milestones-page-broken-on-dark-mode.yml | 5 + ...lDropdown-in-app-assets-javascripts-re.yml | 5 + .../lm-enable-one-d-matrix-by-default.yml | 5 + changelogs/unreleased/revert-aa19ce96.yml | 5 + .../development/one_dimensional_matrix.yml | 2 +- .../development/push_mirror_syncs_lfs.yml | 7 -- ...7_backfill_jira_tracker_deployment_type.rb | 23 +--- doc/api/README.md | 2 +- doc/ci/README.md | 2 + doc/ci/quick_start/README.md | 3 + doc/ci/yaml/README.md | 4 +- .../ci_config_visualization_hover_v13_5.png | Bin 0 -> 30986 bytes .../img/ci_config_visualization_v13_5.png | Bin 0 -> 30319 bytes doc/ci/yaml/visualization.md | 46 ++++++++ .../product_analytics/usage_ping.md | 2 +- .../incident_management/integrations.md | 2 +- .../img/maven_package_view_v12_6.png | Bin 83954 -> 0 bytes doc/user/packages/maven_repository/index.md | 98 +++++++----------- .../packages/workflows/project_registry.md | 14 +-- .../repository_mirroring_push_settings.png | Bin 23955 -> 92335 bytes .../repository/repository_mirroring.md | 1 + .../backfill_jira_tracker_deployment_type.rb | 65 ------------ lib/gitlab/ci/features.rb | 2 +- locale/gitlab.pot | 26 +++-- .../push_mirroring_lfs_over_http_spec.rb | 3 +- .../repository/components/breadcrumbs_spec.js | 6 +- ...kfill_jira_tracker_deployment_type_spec.rb | 80 -------------- ...kfill_jira_tracker_deployment_type_spec.rb | 39 ------- .../update_remote_mirror_service_spec.rb | 66 +++++------- 37 files changed, 242 insertions(+), 390 deletions(-) create mode 100644 changelogs/unreleased/254281-remove-push-mirror-syncs-lfs-feature-flag.yml create mode 100644 changelogs/unreleased/257762-boards-page-broken-on-dark-mode.yml create mode 100644 changelogs/unreleased/257764-milestones-page-broken-on-dark-mode.yml create mode 100644 changelogs/unreleased/Replace-GlDeprecatedDropdown-with-GlDropdown-in-app-assets-javascripts-re.yml create mode 100644 changelogs/unreleased/lm-enable-one-d-matrix-by-default.yml create mode 100644 changelogs/unreleased/revert-aa19ce96.yml delete mode 100644 config/feature_flags/development/push_mirror_syncs_lfs.yml create mode 100644 doc/ci/yaml/img/ci_config_visualization_hover_v13_5.png create mode 100644 doc/ci/yaml/img/ci_config_visualization_v13_5.png create mode 100644 doc/ci/yaml/visualization.md delete mode 100644 doc/user/packages/maven_repository/img/maven_package_view_v12_6.png delete mode 100644 lib/gitlab/background_migration/backfill_jira_tracker_deployment_type.rb delete mode 100644 spec/lib/gitlab/background_migration/backfill_jira_tracker_deployment_type_spec.rb delete mode 100644 spec/migrations/20200910155617_backfill_jira_tracker_deployment_type_spec.rb diff --git a/app/assets/javascripts/alert_management/components/alert_management_table.vue b/app/assets/javascripts/alert_management/components/alert_management_table.vue index fc87252f772..6000acb6aa3 100644 --- a/app/assets/javascripts/alert_management/components/alert_management_table.vue +++ b/app/assets/javascripts/alert_management/components/alert_management_table.vue @@ -94,7 +94,7 @@ export default { }, { key: 'issue', - label: s__('AlertManagement|Issue'), + label: s__('AlertManagement|Incident'), thClass: 'gl-w-12 gl-pointer-events-none', tdClass, }, diff --git a/app/assets/javascripts/repository/components/breadcrumbs.vue b/app/assets/javascripts/repository/components/breadcrumbs.vue index 74437f286b4..677cb265942 100644 --- a/app/assets/javascripts/repository/components/breadcrumbs.vue +++ b/app/assets/javascripts/repository/components/breadcrumbs.vue @@ -1,9 +1,9 @@