diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2017-04-27 16:40:27 -0400 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2017-04-27 16:40:27 -0400 |
| commit | 57f8be4e69acea24456758d2888e0f703a2dfba9 (patch) | |
| tree | dacb22153c3e72321161ebf2e5fc438e1e942a95 /app/controllers | |
| parent | 5976195fef53fe1bc56647dfc06049a8f984d5fe (diff) | |
| parent | 703df2881bb137a79284baafe2cc12ff32ab9ff5 (diff) | |
| download | gitlab-ce-57f8be4e69acea24456758d2888e0f703a2dfba9.tar.gz | |
Merge remote-tracking branch 'origin/29667-deploy-keys' into deploy-keys-load-async
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/deploy_keys_controller.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/app/controllers/projects/deploy_keys_controller.rb b/app/controllers/projects/deploy_keys_controller.rb index d0c44e297e3..a47e15a192b 100644 --- a/app/controllers/projects/deploy_keys_controller.rb +++ b/app/controllers/projects/deploy_keys_controller.rb @@ -8,7 +8,12 @@ class Projects::DeployKeysController < Projects::ApplicationController layout "project_settings" def index - redirect_to_repository_settings(@project) + respond_to do |format| + format.html { redirect_to_repository_settings(@project) } + format.json do + render json: Projects::Settings::DeployKeysPresenter.new(@project, current_user: current_user).as_json + end + end end def new @@ -19,7 +24,7 @@ class Projects::DeployKeysController < Projects::ApplicationController @key = DeployKey.new(deploy_key_params.merge(user: current_user)) unless @key.valid? && @project.deploy_keys << @key - flash[:alert] = @key.errors.full_messages.join(', ').html_safe + flash[:alert] = @key.errors.full_messages.join(', ').html_safe end redirect_to_repository_settings(@project) end |