diff options
| author | Timothy Andrew <mail@timothyandrew.net> | 2016-06-03 09:31:16 +0530 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2016-06-03 09:31:16 +0530 |
| commit | ae0d8222afe1c2482765c92240d35f41d54a73db (patch) | |
| tree | f3ef7e7fd87f21bae33a595d848c18fd56df8b75 /app/controllers/profiles | |
| parent | ffe111c1e22b0cce827c297fea62dfb0bd91326a (diff) | |
| parent | 07b46517cc940b429515374e4e102ff04405e804 (diff) | |
| download | gitlab-ce-ae0d8222afe1c2482765c92240d35f41d54a73db.tar.gz | |
Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokens
Diffstat (limited to 'app/controllers/profiles')
| -rw-r--r-- | app/controllers/profiles/emails_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/profiles/keys_controller.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/profiles/emails_controller.rb b/app/controllers/profiles/emails_controller.rb index 0ede9b8e21b..1c24c4db993 100644 --- a/app/controllers/profiles/emails_controller.rb +++ b/app/controllers/profiles/emails_controller.rb @@ -24,7 +24,7 @@ class Profiles::EmailsController < Profiles::ApplicationController respond_to do |format| format.html { redirect_to profile_emails_url } - format.js { render nothing: true } + format.js { head :ok } end end diff --git a/app/controllers/profiles/keys_controller.rb b/app/controllers/profiles/keys_controller.rb index a12549d6bcb..830e0b9591b 100644 --- a/app/controllers/profiles/keys_controller.rb +++ b/app/controllers/profiles/keys_controller.rb @@ -32,7 +32,7 @@ class Profiles::KeysController < Profiles::ApplicationController respond_to do |format| format.html { redirect_to profile_keys_url } - format.js { render nothing: true } + format.js { head :ok } end end |