summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-11-14 10:14:16 +0000
committerRobert Speicher <robert@gitlab.com>2016-11-14 10:14:16 +0000
commitd67932923f3faf4c8b5a466b511a39bb91b709ef (patch)
treea989c9196e7ea15a2e8e58f5332cd2b1a673b02e
parent352d880a508ec0eec1acba0d0319dc858017ff9b (diff)
parent9869c480973a179a51aec79fcd5373e882195b1b (diff)
downloadgitlab-ce-d67932923f3faf4c8b5a466b511a39bb91b709ef.tar.gz
Merge branch 'zj-remove-unneeded-checks' into 'master'
Remove unneeded nil checks See merge request !7437
-rw-r--r--app/models/project_feature.rb6
1 files changed, 0 insertions, 6 deletions
diff --git a/app/models/project_feature.rb b/app/models/project_feature.rb
index 34fd5a57b5e..5c53c8f1ee5 100644
--- a/app/models/project_feature.rb
+++ b/app/models/project_feature.rb
@@ -49,20 +49,14 @@ class ProjectFeature < ActiveRecord::Base
end
def builds_enabled?
- return true unless builds_access_level
-
builds_access_level > DISABLED
end
def wiki_enabled?
- return true unless wiki_access_level
-
wiki_access_level > DISABLED
end
def merge_requests_enabled?
- return true unless merge_requests_access_level
-
merge_requests_access_level > DISABLED
end