From 2ac811ce685f906d3e54e78b23f61495c19ad595 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 3 Nov 2020 12:08:55 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .rubocop_todo.yml | 51 +----------------- Gemfile | 2 +- Gemfile.lock | 7 +-- .../wikis/components/delete_wiki_modal.vue | 45 ++++++++++------ .../dropdown_contents_labels_view.vue | 11 +++- .../labels_select_vue/store/actions.js | 2 +- changelogs/unreleased/auto-deploy-1-0-7.yml | 5 ++ ...p-fix-labels-dropdown-search-autofocus.yml | 5 ++ .../unreleased/update-haml_lint-to-0-36-0.yml | 5 ++ changelogs/unreleased/wiki-delete.yml | 5 ++ danger/commit_messages/Dangerfile | 14 ++--- doc/README.md | 2 +- doc/administration/gitaly/index.md | 2 +- .../graphql/reference/gitlab_schema.graphql | 2 +- doc/api/graphql/reference/gitlab_schema.json | 2 +- .../contributing/merge_request_workflow.md | 28 +++++++--- doc/development/feature_flags/development.md | 6 +-- .../project/wiki/img/wiki_move_page_1.png | Bin 17270 -> 0 bytes .../project/wiki/img/wiki_move_page_2.png | Bin 10571 -> 0 bytes doc/user/project/wiki/index.md | 41 ++++++++------ lefthook.yml | 10 ++++ .../DAST-Default-Branch-Deploy.gitlab-ci.yml | 2 +- .../ci/templates/Jobs/Deploy.gitlab-ci.yml | 2 +- package.json | 5 +- .../dropdown_contents_labels_view_spec.js | 11 +++- yarn.lock | 8 +-- 26 files changed, 155 insertions(+), 118 deletions(-) create mode 100644 changelogs/unreleased/auto-deploy-1-0-7.yml create mode 100644 changelogs/unreleased/kp-fix-labels-dropdown-search-autofocus.yml create mode 100644 changelogs/unreleased/update-haml_lint-to-0-36-0.yml create mode 100644 changelogs/unreleased/wiki-delete.yml delete mode 100644 doc/user/project/wiki/img/wiki_move_page_1.png delete mode 100644 doc/user/project/wiki/img/wiki_move_page_2.png diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index a69085090c5..4694571d517 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1113,60 +1113,13 @@ Rails/SaveBang: # Cop supports --auto-correct. RSpec/TimecopFreeze: Exclude: - - 'ee/spec/controllers/admin/application_settings_controller_spec.rb' - - 'ee/spec/controllers/projects/security/network_policies_controller_spec.rb' - - 'ee/spec/features/admin/admin_reset_pipeline_minutes_spec.rb' - - 'ee/spec/features/boards/sidebar_spec.rb' - - 'ee/spec/features/groups/analytics/cycle_analytics/filters_and_data_spec.rb' - - 'ee/spec/features/groups/iteration_spec.rb' - - 'ee/spec/features/projects/mirror_spec.rb' - - 'ee/spec/features/projects/services/prometheus_custom_metrics_spec.rb' - - 'ee/spec/finders/productivity_analytics_finder_spec.rb' - - 'ee/spec/frontend/fixtures/analytics.rb' - - 'ee/spec/helpers/vulnerabilities_helper_spec.rb' - - 'ee/spec/lib/analytics/merge_request_metrics_refresh_spec.rb' - - 'ee/spec/lib/analytics/productivity_analytics_request_params_spec.rb' - - 'ee/spec/lib/ee/gitlab/background_migration/populate_vulnerability_historical_statistics_spec.rb' - - 'ee/spec/lib/gitlab/analytics/cycle_analytics/data_collector_spec.rb' - - 'ee/spec/lib/gitlab/analytics/cycle_analytics/group_stage_time_summary_spec.rb' - - 'ee/spec/lib/gitlab/analytics/cycle_analytics/summary/group/stage_time_summary_spec.rb' - - 'ee/spec/lib/gitlab/analytics/type_of_work/tasks_by_type_spec.rb' - - 'ee/spec/lib/gitlab/auth/group_saml/sso_enforcer_spec.rb' - - 'ee/spec/lib/gitlab/database/load_balancing/host_spec.rb' - - 'ee/spec/lib/gitlab/geo/base_request_spec.rb' - - 'ee/spec/lib/gitlab/geo/event_gap_tracking_spec.rb' - 'ee/spec/lib/gitlab/geo/git_push_http_spec.rb' - 'ee/spec/lib/gitlab/geo/log_cursor/daemon_spec.rb' - - 'ee/spec/lib/gitlab/geo/log_cursor/events/repository_updated_event_spec.rb' + - 'ee/spec/lib/gitlab/analytics/cycle_analytics/data_collector_spec.rb' - 'ee/spec/lib/gitlab/geo/oauth/login_state_spec.rb' - 'ee/spec/lib/gitlab/insights/reducers/count_per_period_reducer_spec.rb' - - 'ee/spec/lib/gitlab/prometheus/queries/additional_metrics_environment_query_spec.rb' - - 'ee/spec/lib/gitlab/prometheus/queries/cluster_query_spec.rb' - - 'ee/spec/migrations/populate_vulnerability_historical_statistics_for_year_spec.rb' - - 'ee/spec/migrations/remove_duplicated_cs_findings_spec.rb' - - 'ee/spec/migrations/remove_duplicated_cs_findings_without_vulnerability_id_spec.rb' - - 'ee/spec/migrations/schedule_fix_orphan_promoted_issues_spec.rb' - - 'ee/spec/migrations/schedule_merge_request_any_approval_rule_migration_spec.rb' - - 'ee/spec/migrations/schedule_populate_resolved_on_default_branch_column_spec.rb' - - 'ee/spec/migrations/schedule_populate_vulnerability_historical_statistics_spec.rb' - - 'ee/spec/migrations/schedule_project_any_approval_rule_migration_spec.rb' - - 'ee/spec/migrations/set_resolved_state_on_vulnerabilities_spec.rb' - - 'ee/spec/migrations/20190926180443_schedule_epic_issues_after_epics_move_spec.rb' - - 'ee/spec/models/analytics/cycle_analytics/group_level_spec.rb' - - 'ee/spec/models/burndown_spec.rb' - - 'ee/spec/models/ee/namespace_spec.rb' - - 'ee/spec/models/geo/project_registry_spec.rb' - 'ee/spec/models/merge_train_spec.rb' - - 'ee/spec/models/productivity_analytics_spec.rb' - - 'ee/spec/models/project_spec.rb' - - 'ee/spec/models/vulnerabilities/export_spec.rb' - - 'ee/spec/requests/api/vulnerabilities_spec.rb' - - 'ee/spec/services/geo/file_download_service_spec.rb' - - 'ee/spec/services/vulnerabilities/confirm_service_spec.rb' - - 'ee/spec/services/vulnerabilities/dismiss_service_spec.rb' - - 'ee/spec/services/vulnerabilities/resolve_service_spec.rb' - - 'ee/spec/services/vulnerabilities/revert_to_detected_service_spec.rb' - - 'ee/spec/services/vulnerability_exports/export_service_spec.rb' + - 'ee/spec/frontend/fixtures/analytics.rb' - 'ee/spec/support/shared_contexts/lib/gitlab/insights/reducers/reducers_shared_contexts.rb' - 'qa/spec/support/repeater_spec.rb' - 'spec/features/profiles/active_sessions_spec.rb' diff --git a/Gemfile b/Gemfile index c56aecdb2e9..f78f0b3076f 100644 --- a/Gemfile +++ b/Gemfile @@ -377,7 +377,7 @@ group :development, :test do gem 'rubocop-rspec', '~> 1.37.0' gem 'scss_lint', '~> 0.56.0', require: false - gem 'haml_lint', '~> 0.34.0', require: false + gem 'haml_lint', '~> 0.36.0', require: false gem 'bundler-audit', '~> 0.6.1', require: false gem 'benchmark-ips', '~> 2.3.0', require: false diff --git a/Gemfile.lock b/Gemfile.lock index e9d63891d91..5c77e1a92cf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -548,8 +548,9 @@ GEM haml (5.1.2) temple (>= 0.8.0) tilt - haml_lint (0.34.0) - haml (>= 4.0, < 5.2) + haml_lint (0.36.0) + haml (>= 4.0, < 5.3) + parallel (~> 1.10) rainbow rubocop (>= 0.50.0) sysexits (~> 1.1) @@ -1370,7 +1371,7 @@ DEPENDENCIES grpc (~> 1.30.2) gssapi guard-rspec - haml_lint (~> 0.34.0) + haml_lint (~> 0.36.0) hamlit (~> 2.11.0) hangouts-chat (~> 0.0.5) hashie diff --git a/app/assets/javascripts/pages/shared/wikis/components/delete_wiki_modal.vue b/app/assets/javascripts/pages/shared/wikis/components/delete_wiki_modal.vue index 653aad3d2f5..9723af6ad01 100644 --- a/app/assets/javascripts/pages/shared/wikis/components/delete_wiki_modal.vue +++ b/app/assets/javascripts/pages/shared/wikis/components/delete_wiki_modal.vue @@ -1,7 +1,7 @@