Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
21a251e8
Commit
21a251e8
authored
Apr 06, 2017
by
Sean McGivern
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move usage_ping_enabled into common params
parent
0bc39485
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
app/controllers/admin/application_settings_controller.rb
app/controllers/admin/application_settings_controller.rb
+1
-1
app/models/application_setting.rb
app/models/application_setting.rb
+2
-2
No files found.
app/controllers/admin/application_settings_controller.rb
View file @
21a251e8
...
@@ -148,6 +148,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
...
@@ -148,6 +148,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
:version_check_enabled
,
:version_check_enabled
,
:terminal_max_session_time
,
:terminal_max_session_time
,
:polling_interval_multiplier
,
:polling_interval_multiplier
,
:usage_ping_enabled
,
disabled_oauth_sign_in_sources:
[],
disabled_oauth_sign_in_sources:
[],
import_sources:
[],
import_sources:
[],
...
@@ -169,7 +170,6 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
...
@@ -169,7 +170,6 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
:elasticsearch_search
,
:elasticsearch_search
,
:repository_size_limit
,
:repository_size_limit
,
:shared_runners_minutes
,
:shared_runners_minutes
,
:usage_ping_enabled
,
:minimum_mirror_sync_time
,
:minimum_mirror_sync_time
,
:geo_status_timeout
,
:geo_status_timeout
,
:elasticsearch_experimental_indexer
,
:elasticsearch_experimental_indexer
,
...
...
app/models/application_setting.rb
View file @
21a251e8
...
@@ -257,7 +257,8 @@ class ApplicationSetting < ActiveRecord::Base
...
@@ -257,7 +257,8 @@ class ApplicationSetting < ActiveRecord::Base
terminal_max_session_time:
0
,
terminal_max_session_time:
0
,
two_factor_grace_period:
48
,
two_factor_grace_period:
48
,
user_default_external:
false
,
user_default_external:
false
,
polling_interval_multiplier:
1
polling_interval_multiplier:
1
,
usage_ping_enabled:
true
}
}
end
end
...
@@ -266,7 +267,6 @@ class ApplicationSetting < ActiveRecord::Base
...
@@ -266,7 +267,6 @@ class ApplicationSetting < ActiveRecord::Base
elasticsearch_url:
ENV
[
'ELASTIC_URL'
]
||
'http://localhost:9200'
,
elasticsearch_url:
ENV
[
'ELASTIC_URL'
]
||
'http://localhost:9200'
,
elasticsearch_aws:
false
,
elasticsearch_aws:
false
,
elasticsearch_aws_region:
ENV
[
'ELASTIC_REGION'
]
||
'us-east-1'
,
elasticsearch_aws_region:
ENV
[
'ELASTIC_REGION'
]
||
'us-east-1'
,
usage_ping_enabled:
true
,
minimum_mirror_sync_time:
Gitlab
::
Mirror
::
FIFTEEN
,
minimum_mirror_sync_time:
Gitlab
::
Mirror
::
FIFTEEN
,
repository_size_limit:
0
repository_size_limit:
0
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment