summaryrefslogtreecommitdiff
path: root/app/controllers/projects/project_members_controller.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-05-18 12:48:23 -0500
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-05-18 12:48:23 -0500
commit253a017b0173ae12d83dc4c6976f1b0a838448a6 (patch)
treef19de62135aac3aa12f0e4998516c3be4007ea77 /app/controllers/projects/project_members_controller.rb
parent4ade5ff42511d7931bebb28098c2dc2192caba3e (diff)
parent6a0ea605e8b48deacbb4e93f7bb1d9b9abd2f7f4 (diff)
downloadgitlab-ce-253a017b0173ae12d83dc4c6976f1b0a838448a6.tar.gz
Merge branch 'meinac/gitlab-ce-change_deprecated_render_usage'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/controllers/projects/project_members_controller.rb')
-rw-r--r--app/controllers/projects/project_members_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb
index 33b2625c0ac..cdea5f0b776 100644
--- a/app/controllers/projects/project_members_controller.rb
+++ b/app/controllers/projects/project_members_controller.rb
@@ -55,7 +55,7 @@ class Projects::ProjectMembersController < Projects::ApplicationController
format.html do
redirect_to namespace_project_project_members_path(@project.namespace, @project)
end
- format.js { render nothing: true }
+ format.js { head :ok }
end
end
@@ -81,7 +81,7 @@ class Projects::ProjectMembersController < Projects::ApplicationController
respond_to do |format|
format.html { redirect_to dashboard_projects_path, notice: "You left the project." }
- format.js { render nothing: true }
+ format.js { head :ok }
end
else
if current_user == @project.owner