From dd1c093e289dab5b2142e8e7f02883f2281e7910 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 12 Jul 2021 18:09:09 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .markdownlint.yml | 2 + .../components/frequent_items_list_item.vue | 23 +- .../components/log/collapsible_section.vue | 33 +- .../jobs/components/log/line_number.vue | 6 +- app/assets/javascripts/jobs/constants.js | 2 + .../javascripts/jobs/store/mutations.js | 28 +- app/assets/javascripts/jobs/store/state.js | 3 + app/assets/javascripts/jobs/store/utils.js | 75 ++++- .../pipeline_schedules/create/index.js | 2 +- .../projects/pipeline_schedules/edit/index.js | 2 +- .../projects/pipeline_schedules/new/index.js | 2 +- .../pipeline_schedules/update/index.js | 2 +- .../components/runner_filtered_search_bar.vue | 39 ++- .../runner/components/runner_list.vue | 15 +- .../javascripts/runner/runner_list/index.js | 3 +- .../runner/runner_list/runner_list_app.vue | 12 +- .../stylesheets/framework/dropdowns.scss | 12 +- app/controllers/projects/jobs_controller.rb | 4 + .../single_repository_worker.rb | 2 +- .../infinitely_collapsible_sections.yml | 8 + doc/.vale/gitlab/Acronyms.yml | 1 + doc/.vale/gitlab/spelling-exceptions.txt | 2 + doc/api/index.md | 4 +- doc/ci/examples/php.md | 6 +- doc/development/documentation/structure.md | 11 +- doc/development/packages.md | 6 +- doc/security/rate_limits.md | 2 +- .../monitoring/background_migrations.md | 45 ++- ...hed_background_migrations_queued_v14_0.png | Bin 0 -> 11690 bytes .../img/commit_comment_mr_context.png | Bin 103558 -> 0 bytes .../img/commit_comment_mr_discussions_tab.png | Bin 76927 -> 0 bytes .../img/merge_request_commits_tab.png | Bin 54318 -> 0 bytes doc/user/discussions/index.md | 281 +++++++++--------- doc/user/gitlab_com/index.md | 106 +++---- doc/user/project/settings/index.md | 2 +- lib/backup/gitaly_backup.rb | 4 +- lib/gitlab/database/migration_helpers.rb | 9 +- lib/tasks/gitlab/backup.rake | 3 +- spec/features/admin/admin_runners_spec.rb | 274 +++++++++-------- .../frequent_items_list_item_spec.js | 19 +- spec/frontend/jobs/components/job_app_spec.js | 7 + .../log/collapsible_section_spec.js | 9 + spec/frontend/jobs/components/log/log_spec.js | 91 +++++- .../frontend/jobs/components/log/mock_data.js | 65 ++++ spec/frontend/jobs/store/mutations_spec.js | 94 ++++++ spec/frontend/jobs/store/utils_spec.js | 95 +++++- .../runner_filtered_search_bar_spec.js | 15 + .../runner/components/runner_list_spec.js | 13 - spec/lib/backup/gitaly_backup_spec.rb | 14 +- .../gitlab/database/migration_helpers_spec.rb | 9 +- spec/tasks/gitlab/backup_rake_spec.rb | 2 +- 51 files changed, 1010 insertions(+), 454 deletions(-) create mode 100644 config/feature_flags/development/infinitely_collapsible_sections.yml create mode 100644 doc/user/admin_area/monitoring/img/batched_background_migrations_queued_v14_0.png delete mode 100644 doc/user/discussions/img/commit_comment_mr_context.png delete mode 100644 doc/user/discussions/img/commit_comment_mr_discussions_tab.png delete mode 100644 doc/user/discussions/img/merge_request_commits_tab.png diff --git a/.markdownlint.yml b/.markdownlint.yml index dd04406f68d..ccf2ef02eee 100644 --- a/.markdownlint.yml +++ b/.markdownlint.yml @@ -66,6 +66,7 @@ "Grafana", "Gzip", "Helm", + "HipChat", "ID", "Ingress", "jasmine-jquery", @@ -130,6 +131,7 @@ "Ubuntu", "Ultra Auth", "Unicorn", + "unicorn-worker-killer", "URL", "WebdriverIO", "YAML", diff --git a/app/assets/javascripts/frequent_items/components/frequent_items_list_item.vue b/app/assets/javascripts/frequent_items/components/frequent_items_list_item.vue index 7b169b68d20..1137951ccfc 100644 --- a/app/assets/javascripts/frequent_items/components/frequent_items_list_item.vue +++ b/app/assets/javascripts/frequent_items/components/frequent_items_list_item.vue @@ -5,14 +5,14 @@ import highlight from '~/lib/utils/highlight'; import { truncateNamespace } from '~/lib/utils/text_utility'; import { mapVuexModuleState } from '~/lib/utils/vuex_module_mappers'; import Tracking from '~/tracking'; -import Identicon from '~/vue_shared/components/identicon.vue'; +import ProjectAvatar from '~/vue_shared/components/project_avatar.vue'; const trackingMixin = Tracking.mixin(); export default { components: { - Identicon, GlButton, + ProjectAvatar, }, mixins: [trackingMixin], inject: ['vuexModule'], @@ -64,19 +64,12 @@ export default { class="gl-text-left gl-justify-content-start!" @click="track('click_link', { label: `${dropdownType}_dropdown_frequent_items_list_item` })" > -
- - -
+