diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-15 12:08:57 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-15 12:08:57 +0300 |
| commit | 45a8c43afe8a17de19a92708b380b29b6ae04ce6 (patch) | |
| tree | 4104e6ac741fbbdeefe9b8b699650a06c14e9056 /app/views/projects/milestones | |
| parent | 6bc327a3491069240bd73cc83e17b3078c4148b0 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/milestones')
| -rw-r--r-- | app/views/projects/milestones/_form.html.haml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/views/projects/milestones/_form.html.haml b/app/views/projects/milestones/_form.html.haml index 91c161e8602..be6f9ac83dc 100644 --- a/app/views/projects/milestones/_form.html.haml +++ b/app/views/projects/milestones/_form.html.haml @@ -1,5 +1,9 @@ = gitlab_ui_form_for [@project, @milestone], html: { class: 'milestone-form common-note-form js-quick-submit js-requires-input' } do |f| = form_errors(@milestone) + + - if @conflict + = render 'shared/model_version_conflict', model_name: _('milestone'), link_path: project_milestone_path(@project, @milestone) + - if @redirect_path.present? = f.hidden_field(:redirect_path, name: :redirect_path, id: :redirect_path, value: @redirect_path) .form-group @@ -18,6 +22,8 @@ .clearfix .error-alert + = f.hidden_field :lock_version + - if @milestone.new_record? = f.submit _('Create milestone'), data: { qa_selector: 'create_milestone_button' }, class: 'gl-mr-2', pajamas_button: true = link_to _('Cancel'), project_milestones_path(@project), class: 'gl-button btn btn-default btn-cancel' |