diff options
author | Phil Hughes <me@iamphill.com> | 2017-05-11 07:49:07 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-05-11 07:49:07 +0000 |
commit | 226f3bb94fcd21911a4978621fe2d4cc369358c3 (patch) | |
tree | cba91fc07efce4c841096a9de83b1f831c5ac8ee /app/controllers | |
parent | 64d6569c12fac484ea240cdc9d3be255d83fe523 (diff) | |
parent | 2434d135d6d7953726d1a521fd9faf6ee4590b8a (diff) | |
download | gitlab-ce-226f3bb94fcd21911a4978621fe2d4cc369358c3.tar.gz |
Merge branch '31625-tag-editor-loses-all-inputs-when-you-try-to-add-a-tag-that-already-exists' into 'master'
Resolve "Tag editor loses all inputs when you try to add a tag that already exists"
Closes #31625
See merge request !11155
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/projects/tags_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/projects/tags_controller.rb b/app/controllers/projects/tags_controller.rb index 750c3ec486a..afbea3e2b40 100644 --- a/app/controllers/projects/tags_controller.rb +++ b/app/controllers/projects/tags_controller.rb @@ -38,6 +38,8 @@ class Projects::TagsController < Projects::ApplicationController redirect_to namespace_project_tag_path(@project.namespace, @project, @tag.name) else @error = result[:message] + @message = params[:message] + @release_description = params[:release_description] render action: 'new' end end |