summaryrefslogtreecommitdiff
path: root/app/controllers/projects
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-04-28 17:06:19 +0100
committerPhil Hughes <me@iamphill.com>2017-04-28 17:06:19 +0100
commite11a702afceee7f5edeb8c93a4192fa05209b091 (patch)
treeecb9cea80803638c9b8878b091793beb3ed88720 /app/controllers/projects
parent79e2a524e22e5474c5b33deb81ac6cc51512d2e5 (diff)
downloadgitlab-ce-e11a702afceee7f5edeb8c93a4192fa05209b091.tar.gz
Re-wrote to match our docs - still not 100% sure but closer than it was
Diffstat (limited to 'app/controllers/projects')
-rw-r--r--app/controllers/projects/deploy_keys_controller.rb11
1 files changed, 9 insertions, 2 deletions
diff --git a/app/controllers/projects/deploy_keys_controller.rb b/app/controllers/projects/deploy_keys_controller.rb
index a47e15a192b..f27089b8590 100644
--- a/app/controllers/projects/deploy_keys_controller.rb
+++ b/app/controllers/projects/deploy_keys_controller.rb
@@ -32,7 +32,10 @@ class Projects::DeployKeysController < Projects::ApplicationController
def enable
Projects::EnableDeployKeyService.new(@project, current_user, params).execute
- redirect_to_repository_settings(@project)
+ respond_to do |format|
+ format.html { redirect_to_repository_settings(@project) }
+ format.json { head :ok }
+ end
end
def disable
@@ -40,7 +43,11 @@ class Projects::DeployKeysController < Projects::ApplicationController
return render_404 unless deploy_key_project
deploy_key_project.destroy!
- redirect_to_repository_settings(@project)
+
+ respond_to do |format|
+ format.html { redirect_to_repository_settings(@project) }
+ format.json { head :ok }
+ end
end
protected