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
0
Merge Requests
0
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
Tatuya Kamada
gitlab-ce
Commits
17b3da07
Commit
17b3da07
authored
Apr 28, 2014
by
Drew Blessing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove markdown notation from notification emails
parent
e4c8e8fd
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
9 deletions
+9
-9
app/mailers/emails/merge_requests.rb
app/mailers/emails/merge_requests.rb
+4
-4
app/mailers/emails/notes.rb
app/mailers/emails/notes.rb
+1
-1
app/views/notify/closed_merge_request_email.html.haml
app/views/notify/closed_merge_request_email.html.haml
+1
-1
app/views/notify/closed_merge_request_email.text.haml
app/views/notify/closed_merge_request_email.text.haml
+1
-1
app/views/notify/merged_merge_request_email.html.haml
app/views/notify/merged_merge_request_email.html.haml
+1
-1
app/views/notify/merged_merge_request_email.text.haml
app/views/notify/merged_merge_request_email.text.haml
+1
-1
No files found.
app/mailers/emails/merge_requests.rb
View file @
17b3da07
...
...
@@ -6,7 +6,7 @@ module Emails
@target_url
=
project_merge_request_url
(
@project
,
@merge_request
)
mail
(
from:
sender
(
@merge_request
.
author_id
),
to:
recipient
(
recipient_id
),
subject:
subject
(
"
#{
@merge_request
.
title
}
(
!
#{
@merge_request
.
iid
}
)"
))
subject:
subject
(
"
#{
@merge_request
.
title
}
(
#
#{
@merge_request
.
iid
}
)"
))
end
def
reassigned_merge_request_email
(
recipient_id
,
merge_request_id
,
previous_assignee_id
,
updated_by_user_id
)
...
...
@@ -16,7 +16,7 @@ module Emails
@target_url
=
project_merge_request_url
(
@project
,
@merge_request
)
mail
(
from:
sender
(
updated_by_user_id
),
to:
recipient
(
recipient_id
),
subject:
subject
(
"
#{
@merge_request
.
title
}
(
!
#{
@merge_request
.
iid
}
)"
))
subject:
subject
(
"
#{
@merge_request
.
title
}
(
#
#{
@merge_request
.
iid
}
)"
))
end
def
closed_merge_request_email
(
recipient_id
,
merge_request_id
,
updated_by_user_id
)
...
...
@@ -26,7 +26,7 @@ module Emails
@target_url
=
project_merge_request_url
(
@project
,
@merge_request
)
mail
(
from:
sender
(
updated_by_user_id
),
to:
recipient
(
recipient_id
),
subject:
subject
(
"
#{
@merge_request
.
title
}
(
!
#{
@merge_request
.
iid
}
)"
))
subject:
subject
(
"
#{
@merge_request
.
title
}
(
#
#{
@merge_request
.
iid
}
)"
))
end
def
merged_merge_request_email
(
recipient_id
,
merge_request_id
,
updated_by_user_id
)
...
...
@@ -35,7 +35,7 @@ module Emails
@target_url
=
project_merge_request_url
(
@project
,
@merge_request
)
mail
(
from:
sender
(
updated_by_user_id
),
to:
recipient
(
recipient_id
),
subject:
subject
(
"
#{
@merge_request
.
title
}
(
!
#{
@merge_request
.
iid
}
)"
))
subject:
subject
(
"
#{
@merge_request
.
title
}
(
#
#{
@merge_request
.
iid
}
)"
))
end
end
...
...
app/mailers/emails/notes.rb
View file @
17b3da07
...
...
@@ -27,7 +27,7 @@ module Emails
@target_url
=
project_merge_request_url
(
@project
,
@merge_request
,
anchor:
"note_
#{
@note
.
id
}
"
)
mail
(
from:
sender
(
@note
.
author_id
),
to:
recipient
(
recipient_id
),
subject:
subject
(
"
#{
@merge_request
.
title
}
(
!
#{
@merge_request
.
iid
}
)"
))
subject:
subject
(
"
#{
@merge_request
.
title
}
(
#
#{
@merge_request
.
iid
}
)"
))
end
def
note_wall_email
(
recipient_id
,
note_id
)
...
...
app/views/notify/closed_merge_request_email.html.haml
View file @
17b3da07
%p
=
"Merge Request
!
#{
@merge_request
.
iid
}
was closed by
#{
@updated_by
.
name
}
"
=
"Merge Request
#
#{
@merge_request
.
iid
}
was closed by
#{
@updated_by
.
name
}
"
app/views/notify/closed_merge_request_email.text.haml
View file @
17b3da07
=
"Merge Request
#{
@merge_request
.
iid
}
was closed by
#{
@updated_by
.
name
}
"
=
"Merge Request #
#
{
@merge_request
.
iid
}
was closed by
#{
@updated_by
.
name
}
"
Merge Request url:
#{
project_merge_request_url
(
@merge_request
.
target_project
,
@merge_request
)
}
...
...
app/views/notify/merged_merge_request_email.html.haml
View file @
17b3da07
%p
=
"Merge Request
!
#{
@merge_request
.
iid
}
was merged"
=
"Merge Request
#
#{
@merge_request
.
iid
}
was merged"
app/views/notify/merged_merge_request_email.text.haml
View file @
17b3da07
=
"Merge Request
#{
@merge_request
.
iid
}
was merged"
=
"Merge Request #
#
{
@merge_request
.
iid
}
was merged"
Merge Request Url:
#{
project_merge_request_url
(
@merge_request
.
target_project
,
@merge_request
)
}
...
...
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