Merge pull request #667 from keikubo/master

The indents errors of pre blocks in haml
This commit is contained in:
Dmitriy Zaporozhets 2012-04-11 13:34:15 -07:00
commit 740e54c3fc
8 changed files with 25 additions and 15 deletions

View file

@ -14,5 +14,6 @@
%p
Try:
%pre
sudo chmod -R 770 /home/git/repositories/
sudo chown -R git:git /home/git/repositories/
= preserve do
sudo chmod -R 770 /home/git/repositories/
sudo chown -R git:git /home/git/repositories/

View file

@ -42,7 +42,8 @@
- if @issue.description.present?
.bottom_box_content
= markdown @issue.description
= preserve do
= markdown @issue.description
.issue_notes#notes= render "notes/notes", :tid => @issue.id, :tt => "issue"

View file

@ -4,11 +4,12 @@
%h3 How To Merge
.modal-body
%pre
:erb
git checkout <%= @merge_request.target_branch %>
git fetch origin
git merge origin/<%= @merge_request.source_branch %>
git push origin <%= @merge_request.target_branch %>
= preserve do
:erb
git checkout <%= @merge_request.target_branch %>
git fetch origin
git merge origin/<%= @merge_request.source_branch %>
git push origin <%= @merge_request.target_branch %>
:javascript

View file

@ -39,7 +39,8 @@
- if @milestone.description.present?
.bottom_box_content
= markdown @milestone.description
= preserve do
= markdown @milestone.description
:javascript

View file

@ -9,7 +9,8 @@
%strong= link_to "Remove", [@project, note], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "cred delete-note btn small"
%div.note-title
= markdown(note.note)
= preserve do
= markdown(note.note)
- if note.attachment.url
.right
%div.file

View file

@ -15,7 +15,8 @@
%h3 Git global setup:
- setup_str = ["git config --global user.name \"#{current_user.name}\"",
"git config --global user.email \"#{current_user.email}\""].join("\n")
= raw bash_lexer.highlight(setup_str, :lexer => 'bash', :options => {:encoding => 'utf-8'})
= preserve do
= raw bash_lexer.highlight(setup_str, :lexer => 'bash', :options => {:encoding => 'utf-8'})
%br
%br
@ -29,7 +30,8 @@
"git remote add origin #{@project.url_to_repo}",
"git push -u origin master"].join("\n")
= raw bash_lexer.highlight(repo_setup_str)
= preserve do
= raw bash_lexer.highlight(repo_setup_str)
%br
%br
@ -37,7 +39,8 @@
- exist_repo_setup_str = ["cd existing_git_repo",
"git remote add origin #{@project.url_to_repo}",
"git push -u origin master"].join("\n")
= raw bash_lexer.highlight(exist_repo_setup_str)
= preserve do
= raw bash_lexer.highlight(exist_repo_setup_str)
- if can? current_user, :admin_project, @project
.alert-message.block-message.error.prepend-top-20

View file

@ -41,7 +41,8 @@
%h3= content.name
.readme
- if content.name =~ /\.(md|markdown)$/i
= markdown(content.data)
= preserve do
= markdown(content.data)
- else
= simple_format(content.data)

View file

@ -8,7 +8,8 @@
Edit
%hr
.wiki_content
= markdown_to_html @wiki.content
= preserve do
= markdown_to_html @wiki.content
%p.time Last edited by #{@wiki.user.name}, in #{time_ago_in_words @wiki.created_at}
- if can? current_user, :admin_wiki, @project