summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorVinnie Okada <vokada@mrvinn.com>2015-04-25 23:01:52 -0600
committerVinnie Okada <vokada@mrvinn.com>2015-04-26 07:48:19 -0600
commitbd557e4b64a733f4be64b8cf36b8a551d8e8bab7 (patch)
treebbcfbe5bd73b157755254f9270c0601be4ab74f0 /app/models
parent439b9f50af3168d33169a4cd25b59e45ea46dc62 (diff)
downloadgitlab-ce-bd557e4b64a733f4be64b8cf36b8a551d8e8bab7.tar.gz
Add new admin settings
Add new global application settings for default project and snippet visibility levels.
Diffstat (limited to 'app/models')
-rw-r--r--app/models/application_setting.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index 0d8365c4ff2..9406fb91939 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -17,6 +17,8 @@
# twitter_sharing_enabled :boolean default(TRUE)
# restricted_visibility_levels :text
# max_attachment_size :integer default(10)
+# default_project_visibility :integer
+# default_snippet_visibility :integer
#
class ApplicationSetting < ActiveRecord::Base
@@ -51,7 +53,9 @@ class ApplicationSetting < ActiveRecord::Base
gravatar_enabled: Settings.gravatar['enabled'],
sign_in_text: Settings.extra['sign_in_text'],
restricted_visibility_levels: Settings.gitlab['restricted_visibility_levels'],
- max_attachment_size: Settings.gitlab['max_attachment_size']
+ max_attachment_size: Settings.gitlab['max_attachment_size'],
+ default_project_visibility: Settings.gitlab.default_projects_features['visibility_level'],
+ default_snippet_visibility: Settings.gitlab.default_projects_features['visibility_level']
)
end