diff options
| author | Dylan Griffith <dyl.griffith@gmail.com> | 2018-05-11 10:10:22 +0200 |
|---|---|---|
| committer | Dylan Griffith <dyl.griffith@gmail.com> | 2018-05-16 10:52:28 +0200 |
| commit | b35d16a77f6a63db756a94eeff3788e819e7ed04 (patch) | |
| tree | f0916f7aecaf44ef7150b5a832d202a5a05a190e /lib/api | |
| parent | 8583e4a1478ffe94dfd75c51c8480b323cada6df (diff) | |
| download | gitlab-ce-b35d16a77f6a63db756a94eeff3788e819e7ed04.tar.gz | |
Allow admin to assign shared runner to project through API
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/runners.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/runners.rb b/lib/api/runners.rb index c6dc40ae789..0fb125a6944 100644 --- a/lib/api/runners.rb +++ b/lib/api/runners.rb @@ -203,11 +203,11 @@ module API end def authenticate_enable_runner!(runner) - forbidden!("Runner is shared") if runner.is_shared? - forbidden!("Runner is locked") if runner.locked? forbidden!("Runner is a group runner") if runner.group_type? + return if current_user.admin? + forbidden!("Runner is locked") if runner.locked? forbidden!("No access granted") unless can?(current_user, :assign_runner, runner) end |