Commit b0349915 authored by Sytse Sijbrandij's avatar Sytse Sijbrandij

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

parents cd9a31c2 e2073f28
...@@ -18,8 +18,7 @@ ...@@ -18,8 +18,7 @@
= javascript_include_tag "application" = javascript_include_tag "application"
= csrf_meta_tags = csrf_meta_tags
= include_gon = 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/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') = render 'layouts/piwik' if extra_config.has_key?('piwik_url') && extra_config.has_key?('piwik_site_id')
......
...@@ -25,7 +25,8 @@ ...@@ -25,7 +25,8 @@
Commit message Commit message
.col-sm-10 .col-sm-10
= render 'shared/commit_message_container', {textarea: text_area_tag('commit_message', = 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-holder
.file-title .file-title
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment