Download as
Browse Code »

Commit 2cd3d421817a225dcd6068ce9aeac0689b5b97f0

Authored by Dmitriy Zaporozhets
1 parent 164f9d87
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Use gitlab_config intead of Gitlab.config.gitlab in views

Showing 5 changed files with 5 additions and 5 deletions   Show diff stats
app/helpers/profile_helper.rb
  Diff comments   View file @2cd3d42
@@ -14,6 +14,6 @@ module ProfileHelper @@ -14,6 +14,6 @@ module ProfileHelper
14 end 14 end
15 15
16 def show_profile_remove_tab? 16 def show_profile_remove_tab?
17 - Gitlab.config.gitlab.signup_enabled && !current_user.ldap_user? 17 + gitlab_config.signup_enabled && !current_user.ldap_user?
18 end 18 end
19 end 19 end
app/views/devise/sessions/new.html.haml
  Diff comments   View file @2cd3d42
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 18
19 = render 'devise/sessions/oauth_providers' if devise_mapping.omniauthable? 19 = render 'devise/sessions/oauth_providers' if devise_mapping.omniauthable?
20 20
21 - - if Gitlab.config.gitlab.signup_enabled 21 + - if gitlab_config.signup_enabled
22 %hr 22 %hr
23 %div 23 %div
24 Don't have an account? 24 Don't have an account?
app/views/devise/shared/_links.erb
  Diff comments   View file @2cd3d42
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <%= link_to "Sign in", new_session_path(resource_name), class: "btn" %><br /> 2 <%= link_to "Sign in", new_session_path(resource_name), class: "btn" %><br />
3 <% end -%> 3 <% end -%>
4 4
5 -<%- if devise_mapping.registerable? && controller_name != 'registrations' && Gitlab.config.gitlab.signup_enabled %> 5 +<%- if devise_mapping.registerable? && controller_name != 'registrations' && gitlab_config.signup_enabled %>
6 <%= link_to "Sign up", new_registration_path(resource_name) %><br /> 6 <%= link_to "Sign up", new_registration_path(resource_name) %><br />
7 <% end -%> 7 <% end -%>
8 8
app/views/projects/new.html.haml
  Diff comments   View file @2cd3d42
@@ -51,7 +51,7 @@ @@ -51,7 +51,7 @@
51 = f.label :public do 51 = f.label :public do
52 %span Public project 52 %span Public project
53 .controls 53 .controls
54 - = f.check_box :public, { checked: Gitlab.config.gitlab.default_projects_features.public }, true, false 54 + = f.check_box :public, { checked: gitlab_config.default_projects_features.public }, true, false
55 %span.help-inline Make project visible to everyone 55 %span.help-inline Make project visible to everyone
56 56
57 .form-actions 57 .form-actions
app/views/projects/wikis/git_access.html.haml
  Diff comments   View file @2cd3d42
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 .form-horizontal 11 .form-horizontal
12 .input-prepend.project_clone_holder 12 .input-prepend.project_clone_holder
13 %button{class: "btn active", :"data-clone" => @gollum_wiki.ssh_url_to_repo} SSH 13 %button{class: "btn active", :"data-clone" => @gollum_wiki.ssh_url_to_repo} SSH
14 - %button{class: "btn", :"data-clone" => @gollum_wiki.http_url_to_repo}= Gitlab.config.gitlab.protocol.upcase 14 + %button{class: "btn", :"data-clone" => @gollum_wiki.http_url_to_repo}= gitlab_config.protocol.upcase
15 = text_field_tag :project_clone, @gollum_wiki.url_to_repo, class: "one_click_select input-xxlarge", readonly: true 15 = text_field_tag :project_clone, @gollum_wiki.url_to_repo, class: "one_click_select input-xxlarge", readonly: true
16 .git-empty 16 .git-empty
17 %fieldset 17 %fieldset