From 7ebcead8cfd2edb810dd0cbda816b6cfbd170fe3 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 9 Mar 2020 18:07:59 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../blob/file_template_mediator.js | 6 + .../components/popover.vue | 43 ++++-- .../blob/suggest_gitlab_ci_yml/index.js | 2 +- .../javascripts/blob_edit/blob_bundle.js | 6 + .../groups/components/group_item.vue | 6 +- .../groups/components/item_actions.vue | 2 +- .../stylesheets/components/popover.scss | 6 +- .../applications/base_helm_service.rb | 2 +- app/views/projects/_commit_button.html.haml | 3 +- app/views/projects/blob/_editor.html.haml | 5 +- .../blob/_suggest_gitlab_ci_yml.html.haml | 4 - app/views/projects/blob/new.html.haml | 5 + .../creator-pairing-group-list-padding.yml | 5 + ...09105539_add_index_services_on_template.rb | 19 +++ db/schema.rb | 2 +- doc/development/pipelines.md | 3 +- .../testing_guide/end_to_end/index.md | 1 + .../end_to_end/rspec_metadata_tests.md | 13 ++ doc/security/unlock_user.md | 2 +- doc/topics/autodevops/index.md | 9 +- lib/gitlab/kubernetes/helm/api.rb | 2 +- .../sidekiq_logging/deduplication_logger.rb | 19 +++ lib/gitlab/sidekiq_logging/logs_jobs.rb | 25 ++++ .../sidekiq_logging/structured_logger.rb | 20 +-- .../sidekiq_middleware/duplicate_jobs.rb | 13 ++ .../duplicate_jobs/duplicate_job.rb | 12 ++ .../strategies/until_executing.rb | 5 + locale/gitlab.pot | 6 + .../components/popover_spec.js | 34 ++++- .../diffs/components/tree_list_spec.js | 138 ++++++++++++++++++ .../diffs/components/tree_list_spec.js | 126 ---------------- spec/lib/gitlab/kubernetes/helm/api_spec.rb | 2 +- .../deduplication_logger_spec.rb | 33 +++++ .../duplicate_jobs/duplicate_job_spec.rb | 32 ++++ .../strategies/until_executing_spec.rb | 34 +++++ spec/lib/gitlab/url_blocker_spec.rb | 66 ++------- .../gitlab/url_blockers/url_whitelist_spec.rb | 46 ++++++ ...heck_installation_progress_service_spec.rb | 2 +- .../check_uninstall_progress_service_spec.rb | 2 +- .../applications/install_service_spec.rb | 2 +- .../applications/patch_service_spec.rb | 2 +- .../applications/uninstall_service_spec.rb | 2 +- .../applications/upgrade_service_spec.rb | 2 +- 43 files changed, 522 insertions(+), 247 deletions(-) delete mode 100644 app/views/projects/blob/_suggest_gitlab_ci_yml.html.haml create mode 100644 changelogs/unreleased/creator-pairing-group-list-padding.yml create mode 100644 db/migrate/20200309105539_add_index_services_on_template.rb create mode 100644 doc/development/testing_guide/end_to_end/rspec_metadata_tests.md create mode 100644 lib/gitlab/sidekiq_logging/deduplication_logger.rb create mode 100644 lib/gitlab/sidekiq_logging/logs_jobs.rb create mode 100644 lib/gitlab/sidekiq_middleware/duplicate_jobs.rb create mode 100644 spec/frontend/diffs/components/tree_list_spec.js delete mode 100644 spec/javascripts/diffs/components/tree_list_spec.js create mode 100644 spec/lib/gitlab/sidekiq_logging/deduplication_logger_spec.rb diff --git a/app/assets/javascripts/blob/file_template_mediator.js b/app/assets/javascripts/blob/file_template_mediator.js index 0fb02ca5965..d2c0ef330e4 100644 --- a/app/assets/javascripts/blob/file_template_mediator.js +++ b/app/assets/javascripts/blob/file_template_mediator.js @@ -9,6 +9,7 @@ import GitignoreSelector from './template_selectors/gitignore_selector'; import LicenseSelector from './template_selectors/license_selector'; import toast from '~/vue_shared/plugins/global_toast'; import { __ } from '~/locale'; +import initPopover from '~/blob/suggest_gitlab_ci_yml'; export default class FileTemplateMediator { constructor({ editor, currentAction, projectId }) { @@ -128,6 +129,7 @@ export default class FileTemplateMediator { selectTemplateFile(selector, query, data) { const self = this; const { name } = selector.config; + const suggestCommitChanges = document.querySelector('.js-suggest-gitlab-ci-yml-commit-changes'); selector.renderLoading(); @@ -146,6 +148,10 @@ export default class FileTemplateMediator { }, }, }); + + if (suggestCommitChanges) { + initPopover(suggestCommitChanges); + } }) .catch(err => new Flash(`An error occurred while fetching the template: ${err}`)); } diff --git a/app/assets/javascripts/blob/suggest_gitlab_ci_yml/components/popover.vue b/app/assets/javascripts/blob/suggest_gitlab_ci_yml/components/popover.vue index fa3c19921df..d304ae7dbf6 100644 --- a/app/assets/javascripts/blob/suggest_gitlab_ci_yml/components/popover.vue +++ b/app/assets/javascripts/blob/suggest_gitlab_ci_yml/components/popover.vue @@ -1,10 +1,25 @@