From 2f5c5b1081fe544ecb9a71d8adf88e00f01f3732 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 8 Oct 2020 12:08:31 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab/ci/notify.gitlab-ci.yml | 17 +- .gitlab/ci/rules.gitlab-ci.yml | 14 + .../components/environment_delete.vue | 6 +- .../javascripts/repository/utils/icon.js | 98 ---- .../javascripts/snippet/snippet_embed.js | 37 -- .../javascripts/snippet/snippet_show.js | 59 +-- .../snippets/components/embed_dropdown.vue | 2 +- .../store/modules/filters/actions.js | 121 +++++ .../store/modules/filters/index.js | 10 + .../store/modules/filters/mutation_types.js | 26 + .../store/modules/filters/mutations.js | 109 +++++ .../store/modules/filters/state.js | 47 ++ .../stylesheets/framework/snippets.scss | 23 - .../autocomplete_sources_controller.rb | 2 +- .../settings/operations_controller.rb | 35 +- app/helpers/notes_helper.rb | 1 + app/helpers/snippets_helper.rb | 25 - app/helpers/visibility_level_helper.rb | 17 - .../concerns/mentionable/reference_regexes.rb | 2 +- app/models/vulnerability.rb | 4 + app/services/issues/move_service.rb | 7 +- .../projects/snippets/_actions.html.haml | 36 -- app/views/projects/snippets/show.html.haml | 8 +- app/views/shared/snippets/_blob.html.haml | 13 - app/views/shared/snippets/_header.html.haml | 45 -- app/views/snippets/_actions.html.haml | 35 -- app/views/snippets/show.html.haml | 8 +- .../unreleased/13426-remove-feature-flag.yml | 5 + ...20795-remove-snippets-vue-feature-flag.yml | 5 + .../229038-delete-environment-tooltip.yml | 5 + .../unreleased/nicolasdular-respect-dnt.yml | 5 + changelogs/unreleased/rate-limit-docs.yml | 5 + .../design_management_copy_designs.yml | 7 - .../development/snippets_vue.yml | 7 - config/feature_flags/ops/ci_accept_trace.yml | 4 +- .../geo/replication/geo_validation_tests.md | 1 - .../replication}/img/geo-ha-diagram.png | Bin .../geo/replication/multiple_servers.md | 2 +- .../high_availability/README.md | 7 - .../high_availability/alpha_database.md | 5 - .../high_availability/consul.md | 5 - .../high_availability/database.md | 5 - .../high_availability/gitaly.md | 5 - .../high_availability/gitlab.md | 5 - .../img/fully-distributed.png | Bin 46691 -> 0 bytes .../high_availability/img/horizontal.png | Bin 18179 -> 0 bytes .../high_availability/img/hybrid.png | Bin 20693 -> 0 bytes .../high_availability/load_balancer.md | 5 - .../high_availability/monitoring_node.md | 5 - doc/administration/high_availability/nfs.md | 5 - .../nfs_host_client_setup.md | 5 - .../high_availability/object_storage.md | 5 - .../high_availability/pgbouncer.md | 5 - doc/administration/high_availability/redis.md | 5 - .../high_availability/redis_source.md | 5 - .../high_availability/sidekiq.md | 5 - doc/administration/raketasks/check.md | 2 +- .../reference_architectures/3k_users.md | 4 +- .../reference_architectures/5k_users.md | 4 +- doc/api/personal_access_tokens.md | 4 +- doc/development/api_graphql_styleguide.md | 2 +- doc/development/policies.md | 10 +- doc/development/telemetry/usage_ping.md | 4 +- .../testing_guide/best_practices.md | 4 +- .../end_to_end/environment_selection.md | 2 +- .../testing_guide/frontend_testing.md | 2 +- doc/project_services/bamboo.md | 5 - doc/project_services/bugzilla.md | 5 - doc/project_services/emails_on_push.md | 5 - doc/project_services/hipchat.md | 5 - doc/project_services/irker.md | 5 - doc/project_services/jira.md | 5 - doc/project_services/kubernetes.md | 5 - doc/project_services/mattermost.md | 5 - .../mattermost_slash_commands.md | 5 - doc/project_services/project_services.md | 5 - doc/project_services/redmine.md | 5 - doc/project_services/services_templates.md | 5 - doc/project_services/slack.md | 5 - doc/project_services/slack_slash_commands.md | 5 - doc/security/rate_limits.md | 19 + doc/system_hooks/system_hooks.md | 19 +- doc/user/gitlab_com/index.md | 5 + doc/user/group/epics/index.md | 4 +- doc/user/markdown.md | 1 + doc/user/project/issue_board.md | 38 +- doc/user/project/issues/design_management.md | 3 +- .../test_coverage_visualization.md | 4 +- lib/banzai/filter/reference_filter.rb | 6 +- .../filter/vulnerability_reference_filter.rb | 22 + .../reference_parser/vulnerability_parser.rb | 16 + lib/gitlab/ci/features.rb | 2 +- lib/gitlab/experimentation.rb | 5 + lib/gitlab/gon_helper.rb | 1 - lib/gitlab/reference_extractor.rb | 4 +- locale/gitlab.pot | 9 - scripts/lint-doc.sh | 2 +- scripts/slack | 10 +- .../settings/operations_controller_spec.rb | 115 ++++- .../discussion_comments/snippets_spec.rb | 1 - spec/features/projects/snippets/show_spec.rb | 10 +- .../snippets/user_comments_on_snippet_spec.rb | 1 - .../snippets/user_deletes_snippet_spec.rb | 11 +- .../features/reportable_note/snippets_spec.rb | 1 - .../snippets/internal_snippet_spec.rb | 11 +- .../notes_on_personal_snippets_spec.rb | 1 - .../snippets/private_snippets_spec.rb | 7 +- .../features/snippets/public_snippets_spec.rb | 19 +- spec/features/snippets/show_spec.rb | 12 +- .../snippets/user_deletes_snippet_spec.rb | 12 +- spec/features/snippets_spec.rb | 12 - spec/frontend/blob/viewer/index_spec.js | 59 ++- spec/frontend/fixtures/blob.rb | 10 + spec/frontend/fixtures/snippet.rb | 1 - spec/frontend/repository/utils/icon_spec.js | 23 - spec/frontend/snippets_spec.js | 70 --- .../store/modules/filters/actions_spec.js | 448 ++++++++++++++++++ .../store/modules/filters/mock_data.js | 50 ++ .../store/modules/filters/mutations_spec.js | 116 +++++ .../store/modules/filters/test_helper.js | 11 + spec/helpers/snippets_helper_spec.rb | 50 -- spec/helpers/visibility_level_helper_spec.rb | 24 - spec/lib/gitlab/experimentation_spec.rb | 119 ++++- spec/lib/gitlab/reference_extractor_spec.rb | 2 +- spec/services/issues/move_service_spec.rb | 8 - .../features/snippets_shared_examples.rb | 24 +- 126 files changed, 1478 insertions(+), 958 deletions(-) delete mode 100644 app/assets/javascripts/repository/utils/icon.js delete mode 100644 app/assets/javascripts/snippet/snippet_embed.js create mode 100644 app/assets/javascripts/vue_shared/components/filtered_search_bar/store/modules/filters/actions.js create mode 100644 app/assets/javascripts/vue_shared/components/filtered_search_bar/store/modules/filters/index.js create mode 100644 app/assets/javascripts/vue_shared/components/filtered_search_bar/store/modules/filters/mutation_types.js create mode 100644 app/assets/javascripts/vue_shared/components/filtered_search_bar/store/modules/filters/mutations.js create mode 100644 app/assets/javascripts/vue_shared/components/filtered_search_bar/store/modules/filters/state.js delete mode 100644 app/views/projects/snippets/_actions.html.haml delete mode 100644 app/views/shared/snippets/_blob.html.haml delete mode 100644 app/views/shared/snippets/_header.html.haml delete mode 100644 app/views/snippets/_actions.html.haml create mode 100644 changelogs/unreleased/13426-remove-feature-flag.yml create mode 100644 changelogs/unreleased/220795-remove-snippets-vue-feature-flag.yml create mode 100644 changelogs/unreleased/229038-delete-environment-tooltip.yml create mode 100644 changelogs/unreleased/nicolasdular-respect-dnt.yml create mode 100644 changelogs/unreleased/rate-limit-docs.yml delete mode 100644 config/feature_flags/development/design_management_copy_designs.yml delete mode 100644 config/feature_flags/development/snippets_vue.yml rename doc/administration/{high_availability => geo/replication}/img/geo-ha-diagram.png (100%) delete mode 100644 doc/administration/high_availability/README.md delete mode 100644 doc/administration/high_availability/alpha_database.md delete mode 100644 doc/administration/high_availability/consul.md delete mode 100644 doc/administration/high_availability/database.md delete mode 100644 doc/administration/high_availability/gitaly.md delete mode 100644 doc/administration/high_availability/gitlab.md delete mode 100644 doc/administration/high_availability/img/fully-distributed.png delete mode 100644 doc/administration/high_availability/img/horizontal.png delete mode 100644 doc/administration/high_availability/img/hybrid.png delete mode 100644 doc/administration/high_availability/load_balancer.md delete mode 100644 doc/administration/high_availability/monitoring_node.md delete mode 100644 doc/administration/high_availability/nfs.md delete mode 100644 doc/administration/high_availability/nfs_host_client_setup.md delete mode 100644 doc/administration/high_availability/object_storage.md delete mode 100644 doc/administration/high_availability/pgbouncer.md delete mode 100644 doc/administration/high_availability/redis.md delete mode 100644 doc/administration/high_availability/redis_source.md delete mode 100644 doc/administration/high_availability/sidekiq.md delete mode 100644 doc/project_services/bamboo.md delete mode 100644 doc/project_services/bugzilla.md delete mode 100644 doc/project_services/emails_on_push.md delete mode 100644 doc/project_services/hipchat.md delete mode 100644 doc/project_services/irker.md delete mode 100644 doc/project_services/jira.md delete mode 100644 doc/project_services/kubernetes.md delete mode 100644 doc/project_services/mattermost.md delete mode 100644 doc/project_services/mattermost_slash_commands.md delete mode 100644 doc/project_services/project_services.md delete mode 100644 doc/project_services/redmine.md delete mode 100644 doc/project_services/services_templates.md delete mode 100644 doc/project_services/slack.md delete mode 100644 doc/project_services/slack_slash_commands.md create mode 100644 lib/banzai/filter/vulnerability_reference_filter.rb create mode 100644 lib/banzai/reference_parser/vulnerability_parser.rb delete mode 100644 spec/frontend/repository/utils/icon_spec.js delete mode 100644 spec/frontend/snippets_spec.js create mode 100644 spec/frontend/vue_shared/components/filtered_search_bar/store/modules/filters/actions_spec.js create mode 100644 spec/frontend/vue_shared/components/filtered_search_bar/store/modules/filters/mock_data.js create mode 100644 spec/frontend/vue_shared/components/filtered_search_bar/store/modules/filters/mutations_spec.js create mode 100644 spec/frontend/vue_shared/components/filtered_search_bar/store/modules/filters/test_helper.js diff --git a/.gitlab/ci/notify.gitlab-ci.yml b/.gitlab/ci/notify.gitlab-ci.yml index 6dcf19da942..e18a092bb8f 100644 --- a/.gitlab/ci/notify.gitlab-ci.yml +++ b/.gitlab/ci/notify.gitlab-ci.yml @@ -3,6 +3,8 @@ stage: notify dependencies: [] cache: {} + variables: + MERGE_REQUEST_URL: ${CI_MERGE_REQUEST_PROJECT_URL}/-/merge_requests/${CI_MERGE_REQUEST_IID} before_script: - apk update && apk add git curl bash @@ -16,8 +18,19 @@ notify-update-gitaly: variables: NOTIFY_CHANNEL: g_create_gitaly GITALY_UPDATE_BRANCH: release-tools/update-gitaly - MERGE_REQUEST_URL: ${CI_MERGE_REQUEST_PROJECT_URL}/-/merge_requests/${CI_MERGE_REQUEST_IID} script: - echo "NOTIFY_CHANNEL is ${NOTIFY_CHANNEL}" - echo "CI_PIPELINE_URL is ${CI_PIPELINE_URL}" - - scripts/slack ${NOTIFY_CHANNEL} "☠️ \`${GITALY_UPDATE_BRANCH}\` failed! ☠️ See ${CI_PIPELINE_URL} (triggered from ${MERGE_REQUEST_URL})" ci_failing + - scripts/slack ${NOTIFY_CHANNEL} "☠️ \`${GITALY_UPDATE_BRANCH}\` failed! ☠️ See ${CI_PIPELINE_URL} (triggered from ${MERGE_REQUEST_URL})" ci_failing "GitLab QA Bot" + +notify-security-pipeline: + extends: + - .notify-slack + - .delivery:rules:security-pipeline-merge-result-failure + variables: + NOTIFY_CHANNEL: f_upcoming_release + script: + - echo "NOTIFY_CHANNEL is ${NOTIFY_CHANNEL}" + - echo "CI_PIPELINE_URL is ${CI_PIPELINE_URL}" + # mentions the `@release-managers` group + - scripts/slack ${NOTIFY_CHANNEL} " ☠️ Pipeline for merged result failed! ☠️ See ${CI_PIPELINE_URL} (triggered from ${MERGE_REQUEST_URL})" ci_failing "GitLab Release Tools Bot" diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index ab49f557ec0..e5fa6082a7b 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -73,6 +73,12 @@ .if-rspec-fail-fast-skipped: &if-rspec-fail-fast-skipped if: '$CI_MERGE_REQUEST_TITLE =~ /SKIP RSPEC FAIL-FAST/' +# For Security merge requests, the gitlab-release-tools-bot triggers a new +# pipeline for the "Pipelines for merged results" feature. If the pipeline +# fails, we notify release managers. +.if-security-pipeline-merge-result: &if-security-pipeline-merge-result + if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH && $CI_PROJECT_NAMESPACE == "gitlab-org/security" && $GITLAB_USER_LOGIN == "gitlab-release-tools-bot"' + #################### # Changes patterns # #################### @@ -285,6 +291,14 @@ when: manual allow_failure: true +################## +# Delivery rules # +################## +.delivery:rules:security-pipeline-merge-result-failure: + rules: + - <<: *if-security-pipeline-merge-result + when: on_failure + ###################### # Dev fixtures rules # ###################### diff --git a/app/assets/javascripts/environments/components/environment_delete.vue b/app/assets/javascripts/environments/components/environment_delete.vue index 55aaa6d57bd..68392552f78 100644 --- a/app/assets/javascripts/environments/components/environment_delete.vue +++ b/app/assets/javascripts/environments/components/environment_delete.vue @@ -4,7 +4,6 @@ * Used in the environments table and the environment detail view. */ -import $ from 'jquery'; import { GlTooltipDirective, GlIcon } from '@gitlab/ui'; import { s__ } from '~/locale'; import eventHub from '../event_hub'; @@ -42,7 +41,7 @@ export default { }, methods: { onClick() { - $(this.$el).tooltip('dispose'); + this.$root.$emit('bv::hide::tooltip', this.$options.deleteEnvironmentTooltipId); eventHub.$emit('requestDeleteEnvironment', this.environment); }, onDeleteEnvironment(environment) { @@ -51,11 +50,12 @@ export default { } }, }, + deleteEnvironmentTooltipId: 'delete-environment-button-tooltip', };