diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-10-18 06:29:28 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-10-18 06:29:28 +0000 |
| commit | 05ca0a31476497d8de360bd1303498ffc1379a5c (patch) | |
| tree | e2e83bab397fbd0afd73b2a1fd20907f310db175 | |
| parent | 164f9d876083db94c47185ddcd11c40cde08ea01 (diff) | |
| parent | 2cd3d421817a225dcd6068ce9aeac0689b5b97f0 (diff) | |
| download | gitlab-ce-05ca0a31476497d8de360bd1303498ffc1379a5c.tar.gz | |
Merge branch 'refactor/gitlab_config_helper' of /home/git/repositories/gitlab/gitlabhq
| -rw-r--r-- | app/helpers/profile_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/devise/sessions/new.html.haml | 2 | ||||
| -rw-r--r-- | app/views/devise/shared/_links.erb | 2 | ||||
| -rw-r--r-- | app/views/projects/new.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/wikis/git_access.html.haml | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/app/helpers/profile_helper.rb b/app/helpers/profile_helper.rb index 88d9f184d0e..dd9e03d95a8 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 c6e1d8db577..15854effbfa 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 db931b86288..49e99e25c1d 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" %><br /> <% 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 /> <% end -%> diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml index 0213576927b..980b3783a1c 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 dd01bb99041..57ad4c93ad3 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 |