kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Browse source
This commit is contained in:
Sytse Sijbrandij 2014-10-02 10:54:07 +02:00
commit b0349915e2
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/views/layouts/_head.html.haml
View file

@ -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')

3
app/views/projects/new_tree/show.html.haml
View file

@ -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