diff options
author | Dylan Griffith <dyl.griffith@gmail.com> | 2018-04-24 15:07:34 +1000 |
---|---|---|
committer | Dylan Griffith <dyl.griffith@gmail.com> | 2018-04-24 15:07:34 +1000 |
commit | 1b9c1ac3adb3d65e51f38e37c4705d46c5618f88 (patch) | |
tree | b724afd0596dd658f7ef7baddf9411ff3e599f7d /lib/api/internal.rb | |
parent | 392c411bdc16386ef42c86afaf8c4d8e4cddb955 (diff) | |
parent | 2e00c1a72afc4b7388bb46bd6d58608e2ae61899 (diff) | |
download | gitlab-ce-1b9c1ac3adb3d65e51f38e37c4705d46c5618f88.tar.gz |
Merge branch 'master' into 10244-add-project-ci-cd-settings
Diffstat (limited to 'lib/api/internal.rb')
-rw-r--r-- | lib/api/internal.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/api/internal.rb b/lib/api/internal.rb index fcbc248fc3b..6b72caea8fd 100644 --- a/lib/api/internal.rb +++ b/lib/api/internal.rb @@ -50,7 +50,7 @@ module API access_checker.check(params[:action], params[:changes]) @project ||= access_checker.project rescue Gitlab::GitAccess::UnauthorizedError, Gitlab::GitAccess::NotFoundError => e - return { status: false, message: e.message } + break { status: false, message: e.message } end log_user_activity(actor) @@ -142,21 +142,21 @@ module API if key key.update_last_used_at else - return { 'success' => false, 'message' => 'Could not find the given key' } + break { 'success' => false, 'message' => 'Could not find the given key' } end if key.is_a?(DeployKey) - return { success: false, message: 'Deploy keys cannot be used to retrieve recovery codes' } + break { success: false, message: 'Deploy keys cannot be used to retrieve recovery codes' } end user = key.user unless user - return { success: false, message: 'Could not find a user for the given key' } + break { success: false, message: 'Could not find a user for the given key' } end unless user.two_factor_enabled? - return { success: false, message: 'Two-factor authentication is not enabled for this user' } + break { success: false, message: 'Two-factor authentication is not enabled for this user' } end codes = nil |