diff options
author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-04-19 06:44:27 +0000 |
---|---|---|
committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-04-19 06:44:27 +0000 |
commit | 6ef8b497e721fac49a0914802244f98dd5d99078 (patch) | |
tree | 5aed7daad2568ea843fb2a0a017fcadc27725bf8 /app/assets/javascripts/vue_shared | |
parent | d66f1882ffc5780723bbb38593aac9db590c6efe (diff) | |
parent | 5e3733da3773f187c5a8c20c26f9d5c0432dea57 (diff) | |
download | gitlab-ce-6ef8b497e721fac49a0914802244f98dd5d99078.tar.gz |
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/assets/javascripts/vue_shared')
0 files changed, 0 insertions, 0 deletions