Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

gitlabhq · Oct 2, 2014 · b034991 · b034991
2 parents cd9a31c + e2073f2
commit b034991
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml
@@ -18,8 +18,7 @@
   = javascript_include_tag "application"
   = csrf_meta_tags
   = include_gon
-  :erb
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  %meta{name: 'viewport', content: 'width=device-width, initial-scale=1.0'}
 
   = render 'layouts/google_analytics' if extra_config.has_key?('google_analytics_id')
   = render 'layouts/piwik' if extra_config.has_key?('piwik_url') && extra_config.has_key?('piwik_site_id')

diff --git a/app/views/projects/blame/show.html.haml b/app/views/projects/blame/show.html.haml
@@ -30,5 +30,5 @@
                 %code{ class: highlightjs_class(@blob.name) }
                   :erb
                     <% lines.each do |line| %>
-                      <%= line %>
+                    <%= line %>
                     <% end %>
diff --git a/app/views/projects/new_tree/show.html.haml b/app/views/projects/new_tree/show.html.haml
@@ -25,7 +25,8 @@
         Commit message
       .col-sm-10
         = render 'shared/commit_message_container', {textarea: text_area_tag('commit_message',
-            params[:commit_message], placeholder: "Added new file", required: true, rows: 3, class: 'form-control')}
+            params[:commit_message], placeholder: 'Add new file',
+            required: true, rows: 3, class: 'form-control')}
 
     .file-holder
       .file-title