diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2018-02-02 21:56:22 +0100 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2018-02-02 21:56:22 +0100 |
| commit | 40753029e40b9c2824648a966048595d36efc793 (patch) | |
| tree | 62d97ed6a45a0d2cecc76faf2fea87e63212dde8 /app/helpers/visibility_level_helper.rb | |
| parent | cc209519c892355f019335bbe0107af2f434846b (diff) | |
| parent | a00aed74af67dd72a2aa7bf7e485ff7bdb949ea4 (diff) | |
| download | gitlab-ce-40753029e40b9c2824648a966048595d36efc793.tar.gz | |
Merge branch 'master' into 38175-add-domain-field-to-auto-devops-application-setting
Diffstat (limited to 'app/helpers/visibility_level_helper.rb')
| -rw-r--r-- | app/helpers/visibility_level_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/visibility_level_helper.rb b/app/helpers/visibility_level_helper.rb index c3d5628f241..e395cda03d3 100644 --- a/app/helpers/visibility_level_helper.rb +++ b/app/helpers/visibility_level_helper.rb @@ -151,12 +151,12 @@ module VisibilityLevelHelper def restricted_visibility_levels(show_all = false) return [] if current_user.admin? && !show_all - current_application_settings.restricted_visibility_levels || [] + Gitlab::CurrentSettings.restricted_visibility_levels || [] end delegate :default_project_visibility, :default_group_visibility, - to: :current_application_settings + to: :'Gitlab::CurrentSettings.current_application_settings' def disallowed_visibility_level?(form_model, level) return false unless form_model.respond_to?(:visibility_level_allowed?) |