diff --git a/.rubocop_todo/rails/include_url_helper.yml b/.rubocop_todo/rails/include_url_helper.yml index adc42663523..2dedba19c78 100644 --- a/.rubocop_todo/rails/include_url_helper.yml +++ b/.rubocop_todo/rails/include_url_helper.yml @@ -21,20 +21,16 @@ Rails/IncludeUrlHelper: - app/models/integrations/webex_teams.rb - app/models/integrations/youtrack.rb - app/presenters/alert_management/alert_presenter.rb - - app/presenters/ci/pipeline_presenter.rb - app/presenters/environment_presenter.rb - app/presenters/gitlab/blame_presenter.rb - app/presenters/merge_request_presenter.rb - app/presenters/project_presenter.rb - - app/presenters/prometheus_alert_presenter.rb - app/presenters/release_presenter.rb - app/presenters/releases/evidence_presenter.rb - ee/app/helpers/license_helper.rb - ee/app/models/integrations/github.rb - - ee/app/presenters/merge_request_approver_presenter.rb - ee/spec/helpers/ee/projects/security/configuration_helper_spec.rb - ee/spec/lib/banzai/filter/cross_project_issuable_information_filter_spec.rb - - lib/gitlab/ci/badge/metadata.rb - spec/helpers/merge_requests_helper_spec.rb - spec/helpers/nav/top_nav_helper_spec.rb - spec/helpers/notify_helper_spec.rb diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 21ff8d35786..b9abc36b3c3 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -4ba8618078d9107d52c0d735f76286ab0b113a8a +1de88e4247d4b940f843003781cb2bf75582b826 diff --git a/app/assets/javascripts/issues/form.js b/app/assets/javascripts/issues/form.js index 20a8c251304..33371d065f9 100644 --- a/app/assets/javascripts/issues/form.js +++ b/app/assets/javascripts/issues/form.js @@ -4,8 +4,7 @@ import $ from 'jquery'; import IssuableForm from 'ee_else_ce/issuable/issuable_form'; import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation'; import GLForm from '~/gl_form'; -import initSuggestions from '~/issues/suggestions'; -import initIssuableTypeSelector from '~/issues/type_selector'; +import { initTitleSuggestions, initTypePopover } from '~/issues/new'; import LabelsSelect from '~/labels/labels_select'; import MilestoneSelect from '~/milestones/milestone_select'; import IssuableTemplateSelectors from '~/issuable/issuable_template_selectors'; @@ -20,6 +19,6 @@ export default () => { warnTemplateOverride: true, }); - initSuggestions(); - initIssuableTypeSelector(); + initTitleSuggestions(); + initTypePopover(); }; diff --git a/app/assets/javascripts/issues/suggestions/components/app.vue b/app/assets/javascripts/issues/new/components/title_suggestions.vue similarity index 90% rename from app/assets/javascripts/issues/suggestions/components/app.vue rename to app/assets/javascripts/issues/new/components/title_suggestions.vue index 48a5e220abf..0a9cdb12519 100644 --- a/app/assets/javascripts/issues/suggestions/components/app.vue +++ b/app/assets/javascripts/issues/new/components/title_suggestions.vue @@ -2,12 +2,12 @@ import { GlTooltipDirective, GlIcon } from '@gitlab/ui'; import { __ } from '~/locale'; import query from '../queries/issues.query.graphql'; -import Suggestion from './item.vue'; +import TitleSuggestionsItem from './title_suggestions_item.vue'; export default { components: { - Suggestion, GlIcon, + TitleSuggestionsItem, }, directives: { GlTooltip: GlTooltipDirective, @@ -66,7 +66,7 @@ export default {