diff options
| author | James Edwards-Jones <jamedjo@gmail.com> | 2017-02-06 15:12:27 +0000 |
|---|---|---|
| committer | James Edwards-Jones <jamedjo@gmail.com> | 2017-02-06 15:12:27 +0000 |
| commit | b988faaf85c8e68d501f242b980e5e79a00e2b15 (patch) | |
| tree | faffbfe623bfcbfe1c09bddac00b2cc879baff63 /lib/api/entities.rb | |
| parent | 5af4cae544c8526de63e639bd6c7db730526add3 (diff) | |
| parent | 53db7d1d75e1d14cb20278bd0c1a75ce24a6626d (diff) | |
| download | gitlab-ce-b988faaf85c8e68d501f242b980e5e79a00e2b15.tar.gz | |
Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ce
# Conflicts:
# db/schema.rb
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 a07b2a9ca0f..b1ead48caf7 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -575,6 +575,7 @@ module API expose :koding_url expose :plantuml_enabled expose :plantuml_url + expose :terminal_max_session_time end class Release < Grape::Entity |