Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
d97a9aa4
Commit
d97a9aa4
authored
Apr 23, 2012
by
gitlabhq
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed email markdown
parent
21f3da23
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
22 additions
and
4 deletions
+22
-4
app/mailers/notify.rb
app/mailers/notify.rb
+2
-0
app/views/notify/note_commit_email.html.haml
app/views/notify/note_commit_email.html.haml
+1
-1
app/views/notify/note_issue_email.html.haml
app/views/notify/note_issue_email.html.haml
+1
-1
app/views/notify/note_merge_request_email.html.haml
app/views/notify/note_merge_request_email.html.haml
+1
-1
app/views/notify/note_wall_email.html.haml
app/views/notify/note_wall_email.html.haml
+1
-1
spec/monkeypatch.rb
spec/monkeypatch.rb
+16
-0
No files found.
app/mailers/notify.rb
View file @
d97a9aa4
class
Notify
<
ActionMailer
::
Base
class
Notify
<
ActionMailer
::
Base
add_template_helper
ApplicationHelper
default_url_options
[
:host
]
=
EMAIL_OPTS
[
"host"
]
default_url_options
[
:host
]
=
EMAIL_OPTS
[
"host"
]
default_url_options
[
:protocol
]
=
->
{
EMAIL_OPTS
[
"protocol"
]
?
EMAIL_OPTS
[
"protocol"
]
:
"http"
}.
call
default_url_options
[
:protocol
]
=
->
{
EMAIL_OPTS
[
"protocol"
]
?
EMAIL_OPTS
[
"protocol"
]
:
"http"
}.
call
...
...
app/views/notify/note_commit_email.html.haml
View file @
d97a9aa4
...
@@ -18,6 +18,6 @@
...
@@ -18,6 +18,6 @@
%tr
%tr
%td
{
:valign
=>
"top"
}
%td
{
:valign
=>
"top"
}
%div
{
:style
=>
"background:#f5f5f5; padding:20px;border:1px solid #ddd"
}
%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"
}
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
app/views/notify/note_issue_email.html.haml
View file @
d97a9aa4
...
@@ -20,6 +20,6 @@
...
@@ -20,6 +20,6 @@
%tr
%tr
%td
{
:valign
=>
"top"
}
%td
{
:valign
=>
"top"
}
%div
{
:style
=>
"background:#f5f5f5; padding:20px;border:1px solid #ddd"
}
%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"
}
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
app/views/notify/note_merge_request_email.html.haml
View file @
d97a9aa4
...
@@ -18,6 +18,6 @@
...
@@ -18,6 +18,6 @@
%tr
%tr
%td
{
:valign
=>
"top"
}
%td
{
:valign
=>
"top"
}
%div
{
:style
=>
"background:#f5f5f5; padding:20px;border:1px solid #ddd"
}
%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"
}
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
app/views/notify/note_wall_email.html.haml
View file @
d97a9aa4
...
@@ -18,5 +18,5 @@
...
@@ -18,5 +18,5 @@
%tr
%tr
%td
{
:valign
=>
"top"
}
%td
{
:valign
=>
"top"
}
%div
{
:style
=>
"background:#f5f5f5; padding:20px;border:1px solid #ddd"
}
%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"
}
%td
{
:style
=>
"font-size: 1px; line-height: 1px;"
,
:width
=>
"21"
}
spec/monkeypatch.rb
View file @
d97a9aa4
...
@@ -12,6 +12,10 @@ class Project
...
@@ -12,6 +12,10 @@ class Project
def
path_to_repo
def
path_to_repo
File
.
join
(
Rails
.
root
,
"tmp"
,
"tests"
,
path
)
File
.
join
(
Rails
.
root
,
"tmp"
,
"tests"
,
path
)
end
end
def
satellite
@satellite
||=
FakeSatellite
.
new
end
end
end
class
Key
class
Key
...
@@ -29,3 +33,15 @@ class UsersProject
...
@@ -29,3 +33,15 @@ class UsersProject
true
true
end
end
end
end
class
FakeSatellite
def
exists?
true
end
def
create
true
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment