Commit 740e54c3fc5b3c83e80f4eeb360463a1539d5c7a
Exists in
master
and in
4 other branches
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
app/views/issues/show.html.haml
app/views/merge_requests/_how_to_merge.html.haml
... | ... | @@ -4,11 +4,12 @@ |
4 | 4 | %h3 How To Merge |
5 | 5 | .modal-body |
6 | 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 | 15 | :javascript | ... | ... |
app/views/milestones/show.html.haml
app/views/notes/_show.html.haml
... | ... | @@ -9,7 +9,8 @@ |
9 | 9 | %strong= link_to "Remove", [@project, note], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "cred delete-note btn small" |
10 | 10 | |
11 | 11 | %div.note-title |
12 | - = markdown(note.note) | |
12 | + = preserve do | |
13 | + = markdown(note.note) | |
13 | 14 | - if note.attachment.url |
14 | 15 | .right |
15 | 16 | %div.file | ... | ... |
app/views/projects/empty.html.haml
... | ... | @@ -15,7 +15,8 @@ |
15 | 15 | %h3 Git global setup: |
16 | 16 | - setup_str = ["git config --global user.name \"#{current_user.name}\"", |
17 | 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 | 21 | %br |
21 | 22 | %br |
... | ... | @@ -29,7 +30,8 @@ |
29 | 30 | "git remote add origin #{@project.url_to_repo}", |
30 | 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 | 36 | %br |
35 | 37 | %br |
... | ... | @@ -37,7 +39,8 @@ |
37 | 39 | - exist_repo_setup_str = ["cd existing_git_repo", |
38 | 40 | "git remote add origin #{@project.url_to_repo}", |
39 | 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 | 45 | - if can? current_user, :admin_project, @project |
43 | 46 | .alert-message.block-message.error.prepend-top-20 | ... | ... |
app/views/refs/_tree.html.haml
app/views/wikis/show.html.haml
... | ... | @@ -8,7 +8,8 @@ |
8 | 8 | Edit |
9 | 9 | %hr |
10 | 10 | .wiki_content |
11 | - = markdown_to_html @wiki.content | |
11 | + = preserve do | |
12 | + = markdown_to_html @wiki.content | |
12 | 13 | |
13 | 14 | %p.time Last edited by #{@wiki.user.name}, in #{time_ago_in_words @wiki.created_at} |
14 | 15 | - if can? current_user, :admin_wiki, @project | ... | ... |