diff options
| author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-04-03 20:50:23 +0200 |
|---|---|---|
| committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-04-03 20:50:23 +0200 |
| commit | 034780644df565228d8f44d4b9eca10d01ae1de4 (patch) | |
| tree | df9d4f44cc588ec0cc228212f9fd515dcdf68533 /lib/api/entities.rb | |
| parent | 2651f0b2bf19eb611942651ef3170081c144c1f7 (diff) | |
| parent | 97c49b8426c62b5b398ed9a2bf863d859a4b7e55 (diff) | |
| download | gitlab-ce-26944-add_per_deployment_metrics.tar.gz | |
Merge remote-tracking branch 'upstream/master' into 26944-add_per_deployment_metrics26944-add_per_deployment_metrics
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 5954aea8041..00d44821e3f 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -204,7 +204,7 @@ module API expose :id, :name, :type, :path expose :mode do |obj, options| - filemode = obj.mode.to_s(8) + filemode = obj.mode filemode = "0" + filemode if filemode.length < 6 filemode end @@ -581,6 +581,7 @@ module API expose :plantuml_enabled expose :plantuml_url expose :terminal_max_session_time + expose :polling_interval_multiplier end class Release < Grape::Entity |