From 5d534a1d4b58ef70ef6d87c09b6f37806d61d75a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Wed, 2 Mar 2016 13:02:41 +0000
Subject: Merge branch 'fix/13781-delete-tag-without-ajax' into 'master'

Tag deletion doesn't use AJAX anymore

See merge request !2986
---
 CHANGELOG                                   | 1 +
 app/controllers/projects/tags_controller.rb | 7 ++++++-
 app/views/projects/tags/destroy.js.haml     | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 app/views/projects/tags/destroy.js.haml

diff --git a/CHANGELOG b/CHANGELOG
index 39f470b9bfe..4038049c9e3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,7 @@ v 8.5.2
   - Fix error 500 when commenting on a commit
   - Show days remaining instead of elapsed time for Milestone
   - Fix broken icons on installations with relative URL (Artem Sidorenko)
+  - Fix issue where tag list wasn't refreshed after deleting a tag
   - Fix import from gitlab.com (KazSawada)
   - Improve implementation to check read access to forks and add pagination
   - Don't show any "2FA required" message if it's not actually required
diff --git a/app/controllers/projects/tags_controller.rb b/app/controllers/projects/tags_controller.rb
index 280fe12cc7c..e580487a2c6 100644
--- a/app/controllers/projects/tags_controller.rb
+++ b/app/controllers/projects/tags_controller.rb
@@ -34,6 +34,11 @@ class Projects::TagsController < Projects::ApplicationController
   def destroy
     DeleteTagService.new(project, current_user).execute(params[:id])
 
-    redirect_to namespace_project_tags_path(@project.namespace, @project)
+    respond_to do |format|
+      format.html do
+        redirect_to namespace_project_tags_path(@project.namespace, @project)
+      end
+      format.js
+    end
   end
 end
diff --git a/app/views/projects/tags/destroy.js.haml b/app/views/projects/tags/destroy.js.haml
new file mode 100644
index 00000000000..ffeacb5a004
--- /dev/null
+++ b/app/views/projects/tags/destroy.js.haml
@@ -0,0 +1,3 @@
+$('.js-totaltags-count').html("#{@repository.tags.size}");
+- if @repository.tags.empty?
+  $('.tags').load(document.URL + ' .nothing-here-block').hide().fadeIn(1000)
-- 
cgit v1.2.3