diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-08-01 12:00:34 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-08-01 12:00:34 +0300 |
| commit | 7586693e0b3e7f0e0bacdd8da082f901031e1c98 (patch) | |
| tree | 0d771cdb805da4a3ed7db44bbd2b3c658e62cc35 /lib | |
| parent | de62ce3eddb6d55bfc1a31368bd0f884e4dbe267 (diff) | |
| parent | 7af940e412ee61dbcff75d91488a502e46d0059e (diff) | |
Merge branch 'follow-up-20723' into 'master'
Fix a few disrepencies between CE and EE in the lines ordering
See merge request gitlab-org/gitlab-ce!20937
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/settings.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/settings.rb b/lib/api/settings.rb index be7c7f58d51..6601c268d79 100644 --- a/lib/api/settings.rb +++ b/lib/api/settings.rb @@ -62,7 +62,7 @@ module API requires :housekeeping_incremental_repack_period, type: Integer, desc: "Number of Git pushes after which an incremental 'git repack' is run." end optional :html_emails_enabled, type: Boolean, desc: 'By default GitLab sends emails in HTML and plain text formats so mail clients can choose what format to use. Disable this option if you only want to send emails in plain text format.' - optional :import_sources, type: Array[String], values: %w[github bitbucket gitlab google_code fogbugz git gitlab_project], + optional :import_sources, type: Array[String], values: %w[github bitbucket gitlab google_code fogbugz git gitlab_project manifest], desc: 'Enabled sources for code import during project creation. OmniAuth must be configured for GitHub, Bitbucket, and GitLab.com' optional :koding_enabled, type: Boolean, desc: 'Enable Koding' given koding_enabled: ->(val) { val } do @@ -76,8 +76,8 @@ module API requires :metrics_host, type: String, desc: 'The InfluxDB host' requires :metrics_method_call_threshold, type: Integer, desc: 'A method call is only tracked when it takes longer to complete than the given amount of milliseconds.' requires :metrics_packet_size, type: Integer, desc: 'The amount of points to store in a single UDP packet' - requires :metrics_port, type: Integer, desc: 'The UDP port to use for connecting to InfluxDB' requires :metrics_pool_size, type: Integer, desc: 'The amount of InfluxDB connections to open' + requires :metrics_port, type: Integer, desc: 'The UDP port to use for connecting to InfluxDB' requires :metrics_sample_interval, type: Integer, desc: 'The sampling interval in seconds' requires :metrics_timeout, type: Integer, desc: 'The amount of seconds after which an InfluxDB connection will time out' end |