deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixed email markdown

Browse source
This commit is contained in:
gitlabhq 2012-04-23 15:32:56 +03:00
parent 21f3da2358
commit d97a9aa4a4
6 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/mailers/notify.rb
View file

@ -1,4 +1,6 @@
class Notify < ActionMailer::Base
add_template_helper ApplicationHelper
default_url_options[:host] = EMAIL_OPTS["host"]
default_url_options[:protocol] = -> { EMAIL_OPTS["protocol"] ? EMAIL_OPTS["protocol"] : "http" }.call

2
app/views/notify/note_commit_email.html.haml
View file

@ -18,6 +18,6 @@
%tr
%td{:valign => "top"}
%div{ :style => "background:#f5f5f5; padding:20px;border:1px solid #ddd" }
= RDiscount.new(@note.note, :autolink, :no_pseudo_protocols, :safelink, :smart, :filter_html).to_html.html_safe
= markdown(@note.note)
%td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}

2
app/views/notify/note_issue_email.html.haml
View file

@ -20,6 +20,6 @@
%tr
%td{:valign => "top"}
%div{ :style => "background:#f5f5f5; padding:20px;border:1px solid #ddd" }
= RDiscount.new(@note.note, :autolink, :no_pseudo_protocols, :safelink, :smart, :filter_html).to_html.html_safe
= markdown(@note.note)
%td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}

2
app/views/notify/note_merge_request_email.html.haml
View file

@ -18,6 +18,6 @@
%tr
%td{:valign => "top"}
%div{ :style => "background:#f5f5f5; padding:20px;border:1px solid #ddd" }
= RDiscount.new(@note.note, :autolink, :no_pseudo_protocols, :safelink, :smart, :filter_html).to_html.html_safe
= markdown(@note.note)
%td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}

2
app/views/notify/note_wall_email.html.haml
View file

@ -18,5 +18,5 @@
%tr
%td{:valign => "top"}
%div{ :style => "background:#f5f5f5; padding:20px;border:1px solid #ddd" }
= RDiscount.new(@note.note, :autolink, :no_pseudo_protocols, :safelink, :smart, :filter_html).to_html.html_safe
= markdown(@note.note)
%td{:style => "font-size: 1px; line-height: 1px;", :width => "21"}

16
spec/monkeypatch.rb
View file

@ -12,6 +12,10 @@ class Project
def path_to_repo
File.join(Rails.root, "tmp", "tests", path)
end
def satellite
@satellite ||= FakeSatellite.new
end
end
class Key
@ -29,3 +33,15 @@ class UsersProject
true
end
end
class FakeSatellite
def exists?
true
end
def create
true
end
end