diff --git a/.rubocop.yml b/.rubocop.yml index fb6933d1883..c6046224e4e 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -392,9 +392,7 @@ RSpec/RepeatedExample: - 'spec/features/merge_request/user_posts_diff_notes_spec.rb' - 'spec/features/projects/files/template_type_dropdown_spec.rb' - 'spec/finders/environments_finder_spec.rb' - - 'spec/frontend/fixtures/merge_requests.rb' - 'spec/helpers/users_helper_spec.rb' - - 'spec/lib/gitlab/closing_issue_extractor_spec.rb' - 'spec/lib/gitlab/import_export/project/relation_factory_spec.rb' - 'spec/services/notification_service_spec.rb' - 'spec/services/web_hook_service_spec.rb' diff --git a/GITLAB_WORKHORSE_VERSION b/GITLAB_WORKHORSE_VERSION index 0ac74451100..5239b90e3c2 100644 --- a/GITLAB_WORKHORSE_VERSION +++ b/GITLAB_WORKHORSE_VERSION @@ -1 +1 @@ -8.29.0 +8.30.0 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 e191bfd79cb..5023496e2c3 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 @@ -23,6 +23,8 @@ const popoverStates = { }, }; export default { + dismissTrackValue: 10, + clickTrackValue: 'click_button', components: { GlPopover, GlSprintf, @@ -109,7 +111,16 @@ export default {