diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-03-29 10:54:06 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-03-29 10:54:06 +0000 |
| commit | 8b37ce6f7f6d29604c42c65f3986d60dce0abd6c (patch) | |
| tree | 1bb0959f49edd0980a2336923c6c5399122bf99a /lib/api/entities.rb | |
| parent | b2ccfc084d790d012f43b8f5ffeaaee4c913a08c (diff) | |
| parent | 6ecde0076afa83e30608ea9caba924bbab66a123 (diff) | |
| download | gitlab-ce-8b37ce6f7f6d29604c42c65f3986d60dce0abd6c.tar.gz | |
Merge branch 'add-per-runner-job-timeout' into 'master'
Add per runner job timeout
Closes #43426
See merge request gitlab-org/gitlab-ce!17221
Diffstat (limited to 'lib/api/entities.rb')
| -rw-r--r-- | lib/api/entities.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 16147ee90c9..38161d1f127 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -951,6 +951,7 @@ module API expose :tag_list expose :run_untagged expose :locked + expose :maximum_timeout expose :access_level expose :version, :revision, :platform, :architecture expose :contacted_at @@ -1119,7 +1120,7 @@ module API end class RunnerInfo < Grape::Entity - expose :timeout + expose :metadata_timeout, as: :timeout end class Step < Grape::Entity |