diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml index 5e93ab18dc0d4707c2663ed651106138e2d26451..baa232350a5e0b5206a490481d4c884cb1b6d333 100644 --- a/app/views/devise/sessions/new.html.haml +++ b/app/views/devise/sessions/new.html.haml @@ -26,3 +26,7 @@ - resource_class.omniauth_providers.each do |provider| %span = link_to authbutton(provider, 32), omniauth_authorize_path(resource_name, provider) + + - if extra_config.has_key?('sign_in_text') + %hr + = markdown(extra_config.sign_in_text) diff --git a/app/views/help/index.html.haml b/app/views/help/index.html.haml index ffea654df739e04aaaf265c47a22ce7a8653ff16..7bda5cb60270dece1318e4c525cddda1464ca198 100644 --- a/app/views/help/index.html.haml +++ b/app/views/help/index.html.haml @@ -19,7 +19,7 @@ %ul.well-list %li Email your - = mail_to Gitlab.config.gitlab.support_email, "support contact" + = mail_to gitlab_config.support_email, "support contact" %li Use the = link_to "search bar", '#', onclick: "$('#search').focus();" diff --git a/app/views/layouts/_google_analytics.html.haml b/app/views/layouts/_google_analytics.html.haml new file mode 100644 index 0000000000000000000000000000000000000000..1452651e1c04ce644688ae6516cac7fd8ae45bfc --- /dev/null +++ b/app/views/layouts/_google_analytics.html.haml @@ -0,0 +1,10 @@ +:javascript + var _gaq = _gaq || []; + _gaq.push(['_setAccount', '#{gitlab_config.google_analytics_id}']); + _gaq.push(['_trackPageview']); + + (function() { + var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; + ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; + var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); + })(); diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml index eb83fd2fd450230cab80a6be3f622407fece1ecc..637b2987ff8c71e2409f11d8be1d02e05d2660eb 100644 --- a/app/views/layouts/_head.html.haml +++ b/app/views/layouts/_head.html.haml @@ -9,6 +9,8 @@ = csrf_meta_tags = include_gon + = render 'layouts/google_analytics' if gitlab_config.has_key?('google_analytics_id') + -# Atom feed - if current_user - if controller_name == 'projects' && action_name == 'index' diff --git a/app/views/profiles/account.html.haml b/app/views/profiles/account.html.haml index b20d5c7a6a1c186d92351a8f816260392d78fcd8..16d26c0d8e16a901b10c9b1dc505077bf0dab2ef 100644 --- a/app/views/profiles/account.html.haml +++ b/app/views/profiles/account.html.haml @@ -78,7 +78,7 @@ .input = f.submit 'Save username', class: "btn btn-save" -- if Gitlab.config.gitlab.signup_enabled +- if gitlab_config.signup_enabled %fieldset.remove-account %legend Remove account diff --git a/app/views/shared/_clone_panel.html.haml b/app/views/shared/_clone_panel.html.haml index 9e5b8dade56a0b707c1c2be41483d316462f6d65..62e0fa2589840507d4d8b055aecdb14c4a9f9684 100644 --- a/app/views/shared/_clone_panel.html.haml +++ b/app/views/shared/_clone_panel.html.haml @@ -1,6 +1,6 @@ .input-prepend.input-append.project_clone_holder %button{class: "btn active", :"data-clone" => @project.ssh_url_to_repo} SSH - %button{class: "btn", :"data-clone" => @project.http_url_to_repo}= Gitlab.config.gitlab.protocol.upcase + %button{class: "btn", :"data-clone" => @project.http_url_to_repo}= gitlab_config.protocol.upcase = text_field_tag :project_clone, @project.url_to_repo, class: "one_click_select span7", readonly: true %span.add-on - if @project.public