diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml
index 5e93ab1..baa2323 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 ffea654..7bda5cb 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 0000000..1452651
--- /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 eb83fd2..637b298 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 b20d5c7..16d26c0 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 9e5b8da..62e0fa2 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
--
libgit2 0.21.2