diff options
| author | Sytse Sijbrandij <sytses@gmail.com> | 2014-10-02 10:54:07 +0200 |
|---|---|---|
| committer | Sytse Sijbrandij <sytses@gmail.com> | 2014-10-02 10:54:07 +0200 |
| commit | b0349915e2615617aff9c5291f7e305d59ea3992 (patch) | |
| tree | e67137a394304afae55e7900b92078edaceb702f | |
| parent | cd9a31c2f95bf991869256c42c5b43102eb0e07b (diff) | |
| parent | e2073f286e1eceb961795af5ea88a39b440e49ac (diff) | |
| download | gitlab-ce-b0349915e2615617aff9c5291f7e305d59ea3992.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
| -rw-r--r-- | app/views/layouts/_head.html.haml | 3 | ||||
| -rw-r--r-- | app/views/projects/blame/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/new_tree/show.html.haml | 3 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml index 0c27f679dee..fa6aecb6661 100644 --- 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 index 464e7ca40e1..aca6fde2886 100644 --- 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 index 4ce8d372a38..24d77344fd5 100644 --- 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 |