diff --git a/app/helpers/profile_helper.rb b/app/helpers/profile_helper.rb index 88d9f184d0e50f879113df5a6c9a26ca9806c1d3..dd9e03d95a8e942367fb582167ba4af751457455 100644 --- a/app/helpers/profile_helper.rb +++ b/app/helpers/profile_helper.rb @@ -14,6 +14,6 @@ module ProfileHelper end def show_profile_remove_tab? - Gitlab.config.gitlab.signup_enabled && !current_user.ldap_user? + gitlab_config.signup_enabled && !current_user.ldap_user? end end diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml index c6e1d8db577c077963d9617a2f7a28c322ab91fb..15854effbfa10a28c28b6834f6aa9446bbfae7a1 100644 --- a/app/views/devise/sessions/new.html.haml +++ b/app/views/devise/sessions/new.html.haml @@ -18,7 +18,7 @@ = render 'devise/sessions/oauth_providers' if devise_mapping.omniauthable? - - if Gitlab.config.gitlab.signup_enabled + - if gitlab_config.signup_enabled %hr %div Don't have an account? diff --git a/app/views/devise/shared/_links.erb b/app/views/devise/shared/_links.erb index db931b86288effeb3cf6b65ce8bb49b90384598a..49e99e25c1d27a78895700b76f6bd34e2ce329c3 100644 --- a/app/views/devise/shared/_links.erb +++ b/app/views/devise/shared/_links.erb @@ -2,7 +2,7 @@ <%= link_to "Sign in", new_session_path(resource_name), class: "btn" %>
<% end -%> -<%- if devise_mapping.registerable? && controller_name != 'registrations' && Gitlab.config.gitlab.signup_enabled %> +<%- if devise_mapping.registerable? && controller_name != 'registrations' && gitlab_config.signup_enabled %> <%= link_to "Sign up", new_registration_path(resource_name) %>
<% end -%> diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml index 0213576927bc5710bb66b835cb8d8ff084a48442..980b3783a1c4e0868f127e7be908fbea79dc6ec2 100644 --- a/app/views/projects/new.html.haml +++ b/app/views/projects/new.html.haml @@ -51,7 +51,7 @@ = f.label :public do %span Public project .controls - = f.check_box :public, { checked: Gitlab.config.gitlab.default_projects_features.public }, true, false + = f.check_box :public, { checked: gitlab_config.default_projects_features.public }, true, false %span.help-inline Make project visible to everyone .form-actions diff --git a/app/views/projects/wikis/git_access.html.haml b/app/views/projects/wikis/git_access.html.haml index dd01bb990415000c5d2e5d6fb9531d10cefc9cd3..57ad4c93ad31a2319aee34a4a017099e75ff1365 100644 --- a/app/views/projects/wikis/git_access.html.haml +++ b/app/views/projects/wikis/git_access.html.haml @@ -11,7 +11,7 @@ .form-horizontal .input-prepend.project_clone_holder %button{class: "btn active", :"data-clone" => @gollum_wiki.ssh_url_to_repo} SSH - %button{class: "btn", :"data-clone" => @gollum_wiki.http_url_to_repo}= Gitlab.config.gitlab.protocol.upcase + %button{class: "btn", :"data-clone" => @gollum_wiki.http_url_to_repo}= gitlab_config.protocol.upcase = text_field_tag :project_clone, @gollum_wiki.url_to_repo, class: "one_click_select input-xxlarge", readonly: true .git-empty %fieldset