Commit 752e45af authored by Jan Provaznik's avatar Jan Provaznik

Merge branch...

Merge branch '349517-iteration-markdown-editor-doesnt-appear-to-support-popup-auto-complete' into 'master'

Enable autocomplete features on iteration forms

See merge request gitlab-org/gitlab!77511
parents 40a10e68 bcb5110c
- object = @target_project || @project || @group - object = @target_project || @project || @group
- noteable_type = @noteable.class if @noteable.present? - noteable_type = @noteable_type || @noteable&.class
- datasources = autocomplete_data_sources(object, noteable_type) - datasources = autocomplete_data_sources(object, noteable_type)
......
...@@ -46,7 +46,7 @@ export default { ...@@ -46,7 +46,7 @@ export default {
iterations: [], iterations: [],
loading: false, loading: false,
title: this.iteration.title, title: this.iteration.title,
description: this.iteration.description, description: this.iteration.description ?? '',
startDate: this.iteration.startDate, startDate: this.iteration.startDate,
dueDate: this.iteration.dueDate, dueDate: this.iteration.dueDate,
}; };
......
...@@ -4,6 +4,7 @@ class Groups::IterationsController < Groups::ApplicationController ...@@ -4,6 +4,7 @@ class Groups::IterationsController < Groups::ApplicationController
before_action :check_iterations_available! before_action :check_iterations_available!
before_action :authorize_show_iteration!, only: [:index, :show] before_action :authorize_show_iteration!, only: [:index, :show]
before_action :authorize_create_iteration!, only: [:new, :edit] before_action :authorize_create_iteration!, only: [:new, :edit]
before_action :set_noteable_type, only: [:show, :new, :edit]
feature_category :team_planning feature_category :team_planning
...@@ -17,6 +18,10 @@ class Groups::IterationsController < Groups::ApplicationController ...@@ -17,6 +18,10 @@ class Groups::IterationsController < Groups::ApplicationController
private private
def set_noteable_type
@noteable_type = Iteration
end
def check_iterations_available! def check_iterations_available!
render_404 unless group.licensed_feature_available?(:iterations) render_404 unless group.licensed_feature_available?(:iterations)
end end
......
- @gfm_form = true
- add_to_breadcrumbs _("Iterations"), group_iterations_path(@group) - add_to_breadcrumbs _("Iterations"), group_iterations_path(@group)
- breadcrumb_title params[:id] - breadcrumb_title params[:id]
- page_title s_("Iterations|Edit iteration") - page_title s_("Iterations|Edit iteration")
......
- @gfm_form = true
- add_to_breadcrumbs _("Iterations"), group_iterations_path(@group) - add_to_breadcrumbs _("Iterations"), group_iterations_path(@group)
- breadcrumb_title _("New") - breadcrumb_title _("New")
- page_title _("Iterations") - page_title _("Iterations")
......
- @gfm_form = true
- add_to_breadcrumbs _("Iterations"), group_iterations_path(@group) - add_to_breadcrumbs _("Iterations"), group_iterations_path(@group)
- breadcrumb_title params[:id] - breadcrumb_title params[:id]
- page_title _("Iterations") - page_title _("Iterations")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment