Commit 2cd3d421 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Use gitlab_config intead of Gitlab.config.gitlab in views

parent 164f9d87
...@@ -14,6 +14,6 @@ module ProfileHelper ...@@ -14,6 +14,6 @@ module ProfileHelper
end end
def show_profile_remove_tab? def show_profile_remove_tab?
Gitlab.config.gitlab.signup_enabled && !current_user.ldap_user? gitlab_config.signup_enabled && !current_user.ldap_user?
end end
end end
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
= render 'devise/sessions/oauth_providers' if devise_mapping.omniauthable? = render 'devise/sessions/oauth_providers' if devise_mapping.omniauthable?
- if Gitlab.config.gitlab.signup_enabled - if gitlab_config.signup_enabled
%hr %hr
%div %div
Don't have an account? Don't have an account?
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<%= link_to "Sign in", new_session_path(resource_name), class: "btn" %><br /> <%= link_to "Sign in", new_session_path(resource_name), class: "btn" %><br />
<% end -%> <% 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) %><br /> <%= link_to "Sign up", new_registration_path(resource_name) %><br />
<% end -%> <% end -%>
......
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
= f.label :public do = f.label :public do
%span Public project %span Public project
.controls .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 %span.help-inline Make project visible to everyone
.form-actions .form-actions
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
.form-horizontal .form-horizontal
.input-prepend.project_clone_holder .input-prepend.project_clone_holder
%button{class: "btn active", :"data-clone" => @gollum_wiki.ssh_url_to_repo} SSH %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 = text_field_tag :project_clone, @gollum_wiki.url_to_repo, class: "one_click_select input-xxlarge", readonly: true
.git-empty .git-empty
%fieldset %fieldset
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment