diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-09-04 08:23:50 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-09-04 08:23:50 +0000 |
| commit | d449355f94e54788efb70e8998327720060afddc (patch) | |
| tree | a140bc43e2ac498d6fd2c20defde3afccf3f392c /lib/api/entities.rb | |
| parent | a343484bdf6de75383c4667cc6b161a5c47dbeef (diff) | |
| parent | 53b5346d407d2303e88d8cf5d6e9271996051cf1 (diff) | |
| download | gitlab-ce-d449355f94e54788efb70e8998327720060afddc.tar.gz | |
Merge branch 'feature/sm/33281-protected-runner-executes-jobs-on-protected-branch' into 'master'
Protected runner executes jobs on protected branch [Solution 1]
Closes #33281
See merge request !13194
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 9df9a515990..f13f2d723bb 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -775,6 +775,7 @@ module API expose :tag_list expose :run_untagged expose :locked + expose :access_level expose :version, :revision, :platform, :architecture expose :contacted_at expose :token, if: lambda { |runner, options| options[:current_user].admin? || !runner.is_shared? } |