Download as
Browse Code »

Commit 740e54c3fc5b3c83e80f4eeb360463a1539d5c7a

Authored by Dmitriy Zaporozhets
2 parents e7add858 42f04bf7
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #667 from keikubo/master 

The indents errors of pre blocks in haml
Showing 8 changed files with 25 additions and 15 deletions   Show diff stats
app/views/errors/gitolite.html.haml
  Diff comments   View file @740e54c
@@ -14,5 +14,6 @@ @@ -14,5 +14,6 @@
14 %p 14 %p
15 Try: 15 Try:
16 %pre 16 %pre
17 - sudo chmod -R 770 /home/git/repositories/  
18 - sudo chown -R git:git /home/git/repositories/ 17 + = preserve do
  18 + sudo chmod -R 770 /home/git/repositories/
  19 + sudo chown -R git:git /home/git/repositories/
app/views/issues/show.html.haml
  Diff comments   View file @740e54c
@@ -42,7 +42,8 @@ @@ -42,7 +42,8 @@
42 42
43 - if @issue.description.present? 43 - if @issue.description.present?
44 .bottom_box_content 44 .bottom_box_content
45 - = markdown @issue.description 45 + = preserve do
  46 + = markdown @issue.description
46 47
47 48
48 .issue_notes#notes= render "notes/notes", :tid => @issue.id, :tt => "issue" 49 .issue_notes#notes= render "notes/notes", :tid => @issue.id, :tt => "issue"
app/views/merge_requests/_how_to_merge.html.haml
  Diff comments   View file @740e54c
@@ -4,11 +4,12 @@ @@ -4,11 +4,12 @@
4 %h3 How To Merge 4 %h3 How To Merge
5 .modal-body 5 .modal-body
6 %pre 6 %pre
7 - :erb  
8 - git checkout <%= @merge_request.target_branch %>  
9 - git fetch origin  
10 - git merge origin/<%= @merge_request.source_branch %>  
11 - git push origin <%= @merge_request.target_branch %> 7 + = preserve do
  8 + :erb
  9 + git checkout <%= @merge_request.target_branch %>
  10 + git fetch origin
  11 + git merge origin/<%= @merge_request.source_branch %>
  12 + git push origin <%= @merge_request.target_branch %>
12 13
13 14
14 :javascript 15 :javascript
app/views/milestones/show.html.haml
  Diff comments   View file @740e54c
@@ -39,7 +39,8 @@ @@ -39,7 +39,8 @@
39 39
40 - if @milestone.description.present? 40 - if @milestone.description.present?
41 .bottom_box_content 41 .bottom_box_content
42 - = markdown @milestone.description 42 + = preserve do
  43 + = markdown @milestone.description
43 44
44 45
45 :javascript 46 :javascript
app/views/notes/_show.html.haml
  Diff comments   View file @740e54c
@@ -9,7 +9,8 @@ @@ -9,7 +9,8 @@
9 %strong= link_to "Remove", [@project, note], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "cred delete-note btn small" 9 %strong= link_to "Remove", [@project, note], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "cred delete-note btn small"
10 10
11 %div.note-title 11 %div.note-title
12 - = markdown(note.note) 12 + = preserve do
  13 + = markdown(note.note)
13 - if note.attachment.url 14 - if note.attachment.url
14 .right 15 .right
15 %div.file 16 %div.file
app/views/projects/empty.html.haml
  Diff comments   View file @740e54c
@@ -15,7 +15,8 @@ @@ -15,7 +15,8 @@
15 %h3 Git global setup: 15 %h3 Git global setup:
16 - setup_str = ["git config --global user.name \"#{current_user.name}\"", 16 - setup_str = ["git config --global user.name \"#{current_user.name}\"",
17 "git config --global user.email \"#{current_user.email}\""].join("\n") 17 "git config --global user.email \"#{current_user.email}\""].join("\n")
18 - = raw bash_lexer.highlight(setup_str, :lexer => 'bash', :options => {:encoding => 'utf-8'}) 18 + = preserve do
  19 + = raw bash_lexer.highlight(setup_str, :lexer => 'bash', :options => {:encoding => 'utf-8'})
19 20
20 %br 21 %br
21 %br 22 %br
@@ -29,7 +30,8 @@ @@ -29,7 +30,8 @@
29 "git remote add origin #{@project.url_to_repo}", 30 "git remote add origin #{@project.url_to_repo}",
30 "git push -u origin master"].join("\n") 31 "git push -u origin master"].join("\n")
31 32
32 - = raw bash_lexer.highlight(repo_setup_str) 33 + = preserve do
  34 + = raw bash_lexer.highlight(repo_setup_str)
33 35
34 %br 36 %br
35 %br 37 %br
@@ -37,7 +39,8 @@ @@ -37,7 +39,8 @@
37 - exist_repo_setup_str = ["cd existing_git_repo", 39 - exist_repo_setup_str = ["cd existing_git_repo",
38 "git remote add origin #{@project.url_to_repo}", 40 "git remote add origin #{@project.url_to_repo}",
39 "git push -u origin master"].join("\n") 41 "git push -u origin master"].join("\n")
40 - = raw bash_lexer.highlight(exist_repo_setup_str) 42 + = preserve do
  43 + = raw bash_lexer.highlight(exist_repo_setup_str)
41 44
42 - if can? current_user, :admin_project, @project 45 - if can? current_user, :admin_project, @project
43 .alert-message.block-message.error.prepend-top-20 46 .alert-message.block-message.error.prepend-top-20
app/views/refs/_tree.html.haml
  Diff comments   View file @740e54c
@@ -41,7 +41,8 @@ @@ -41,7 +41,8 @@
41 %h3= content.name 41 %h3= content.name
42 .readme 42 .readme
43 - if content.name =~ /\.(md|markdown)$/i 43 - if content.name =~ /\.(md|markdown)$/i
44 - = markdown(content.data) 44 + = preserve do
  45 + = markdown(content.data)
45 - else 46 - else
46 = simple_format(content.data) 47 = simple_format(content.data)
47 48
app/views/wikis/show.html.haml
  Diff comments   View file @740e54c
@@ -8,7 +8,8 @@ @@ -8,7 +8,8 @@
8 Edit 8 Edit
9 %hr 9 %hr
10 .wiki_content 10 .wiki_content
11 - = markdown_to_html @wiki.content 11 + = preserve do
  12 + = markdown_to_html @wiki.content
12 13
13 %p.time Last edited by #{@wiki.user.name}, in #{time_ago_in_words @wiki.created_at} 14 %p.time Last edited by #{@wiki.user.name}, in #{time_ago_in_words @wiki.created_at}
14 - if can? current_user, :admin_wiki, @project 15 - if can? current_user, :admin_wiki, @project