summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-09-21 18:19:44 +0000
committerRobert Speicher <robert@gitlab.com>2016-09-21 18:19:44 +0000
commit4e7eb30923ee06248648e4ec7fd37ca40fc9fa8d (patch)
tree5abcb0d7f89c9a1550b7bfe7ca56c0c9ebaebcab
parentb3efa39762336ffd0ed36a79be515cac368f5591 (diff)
parent957300199911585ec16acd80d591d43ab0d5a4e3 (diff)
downloadgitlab-ce-4e7eb30923ee06248648e4ec7fd37ca40fc9fa8d.tar.gz
Merge branch 'zj-default-setting-features' into 'master'
Add default values for ProjectFeature See merge request !6447
-rw-r--r--app/models/project_feature.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/models/project_feature.rb b/app/models/project_feature.rb
index 9c602c582bd..8c9534c3565 100644
--- a/app/models/project_feature.rb
+++ b/app/models/project_feature.rb
@@ -22,6 +22,12 @@ class ProjectFeature < ActiveRecord::Base
belongs_to :project
+ default_value_for :builds_access_level, value: ENABLED, allows_nil: false
+ default_value_for :issues_access_level, value: ENABLED, allows_nil: false
+ default_value_for :merge_requests_access_level, value: ENABLED, allows_nil: false
+ default_value_for :snippets_access_level, value: ENABLED, allows_nil: false
+ default_value_for :wiki_access_level, value: ENABLED, allows_nil: false
+
def feature_available?(feature, user)
raise ArgumentError, 'invalid project feature' unless FEATURES.include?(feature)