Commit d97a9aa4 authored by gitlabhq's avatar gitlabhq

fixed email markdown

parent 21f3da23
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
......
......@@ -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"}
......@@ -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"}
......@@ -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"}
......@@ -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"}
......@@ -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
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