diff options
author | Rémy Coutable <remy@rymai.me> | 2016-06-21 10:08:42 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-06-21 10:08:42 +0000 |
commit | f90c8c624d2bf0391a25ae07b1516d11948e1a81 (patch) | |
tree | fd07addffeec378dacf626d98e9ffbbb645dee1e /lib/api/entities.rb | |
parent | 027b07cab884d0edae16bc94ae10d604fb4d042c (diff) | |
parent | cdcbc8d7219a669c016aaba89a1d47faebdd2208 (diff) | |
download | gitlab-ce-f90c8c624d2bf0391a25ae07b1516d11948e1a81.tar.gz |
Merge branch 'feature/runner-lock-on-project' into 'master'
Make it possible to lock runner on a specific project
Make it possible to lock runner on a specific project.

----

----

Closes #3407
See merge request !4093
Diffstat (limited to 'lib/api/entities.rb')
-rw-r--r-- | lib/api/entities.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 2e397643ed1..3fde7aa989f 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -423,6 +423,7 @@ module API class RunnerDetails < Runner expose :tag_list expose :run_untagged + expose :locked expose :version, :revision, :platform, :architecture expose :contacted_at expose :token, if: lambda { |runner, options| options[:current_user].is_admin? || !runner.is_shared? } |