Commit 740e54c3 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #667 from keikubo/master

The indents errors of pre blocks in haml
parents e7add858 42f04bf7
...@@ -14,5 +14,6 @@ ...@@ -14,5 +14,6 @@
%p %p
Try: Try:
%pre %pre
= preserve do
sudo chmod -R 770 /home/git/repositories/ sudo chmod -R 770 /home/git/repositories/
sudo chown -R git:git /home/git/repositories/ sudo chown -R git:git /home/git/repositories/
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
- if @issue.description.present? - if @issue.description.present?
.bottom_box_content .bottom_box_content
= preserve do
= markdown @issue.description = markdown @issue.description
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
%h3 How To Merge %h3 How To Merge
.modal-body .modal-body
%pre %pre
= preserve do
:erb :erb
git checkout <%= @merge_request.target_branch %> git checkout <%= @merge_request.target_branch %>
git fetch origin git fetch origin
......
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
- if @milestone.description.present? - if @milestone.description.present?
.bottom_box_content .bottom_box_content
= preserve do
= markdown @milestone.description = markdown @milestone.description
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
%strong= link_to "Remove", [@project, note], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "cred delete-note btn small" %strong= link_to "Remove", [@project, note], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "cred delete-note btn small"
%div.note-title %div.note-title
= preserve do
= markdown(note.note) = markdown(note.note)
- if note.attachment.url - if note.attachment.url
.right .right
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
%h3 Git global setup: %h3 Git global setup:
- setup_str = ["git config --global user.name \"#{current_user.name}\"", - setup_str = ["git config --global user.name \"#{current_user.name}\"",
"git config --global user.email \"#{current_user.email}\""].join("\n") "git config --global user.email \"#{current_user.email}\""].join("\n")
= preserve do
= raw bash_lexer.highlight(setup_str, :lexer => 'bash', :options => {:encoding => 'utf-8'}) = raw bash_lexer.highlight(setup_str, :lexer => 'bash', :options => {:encoding => 'utf-8'})
%br %br
...@@ -29,6 +30,7 @@ ...@@ -29,6 +30,7 @@
"git remote add origin #{@project.url_to_repo}", "git remote add origin #{@project.url_to_repo}",
"git push -u origin master"].join("\n") "git push -u origin master"].join("\n")
= preserve do
= raw bash_lexer.highlight(repo_setup_str) = raw bash_lexer.highlight(repo_setup_str)
%br %br
...@@ -37,6 +39,7 @@ ...@@ -37,6 +39,7 @@
- exist_repo_setup_str = ["cd existing_git_repo", - exist_repo_setup_str = ["cd existing_git_repo",
"git remote add origin #{@project.url_to_repo}", "git remote add origin #{@project.url_to_repo}",
"git push -u origin master"].join("\n") "git push -u origin master"].join("\n")
= preserve do
= raw bash_lexer.highlight(exist_repo_setup_str) = raw bash_lexer.highlight(exist_repo_setup_str)
- if can? current_user, :admin_project, @project - if can? current_user, :admin_project, @project
......
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
%h3= content.name %h3= content.name
.readme .readme
- if content.name =~ /\.(md|markdown)$/i - if content.name =~ /\.(md|markdown)$/i
= preserve do
= markdown(content.data) = markdown(content.data)
- else - else
= simple_format(content.data) = simple_format(content.data)
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
Edit Edit
%hr %hr
.wiki_content .wiki_content
= preserve do
= markdown_to_html @wiki.content = markdown_to_html @wiki.content
%p.time Last edited by #{@wiki.user.name}, in #{time_ago_in_words @wiki.created_at} %p.time Last edited by #{@wiki.user.name}, in #{time_ago_in_words @wiki.created_at}
......
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