diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-04-19 09:44:27 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-04-19 09:44:27 +0300 |
| commit | 6ef8b497e721fac49a0914802244f98dd5d99078 (patch) | |
| tree | 5aed7daad2568ea843fb2a0a017fcadc27725bf8 /app/models/project.rb | |
| parent | d66f1882ffc5780723bbb38593aac9db590c6efe (diff) | |
| parent | 5e3733da3773f187c5a8c20c26f9d5c0432dea57 (diff) | |
Merge branch '5320-fix-gitlab-features-env-var' into 'master'
Get GITLAB_FEATURES from Project#licensed_features instead of Namespace#features (#5320)
See merge request gitlab-org/gitlab-ce!18189
Diffstat (limited to 'app/models/project.rb')
| -rw-r--r-- | app/models/project.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 5c37cd85243..cec1e705aa8 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -1875,6 +1875,10 @@ class Project < ActiveRecord::Base memoized_results[cache_key] end + def licensed_features + [] + end + private def storage |