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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
0bc94198
Commit
0bc94198
authored
Aug 19, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix BaseMailer.
parent
4e33127b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
19 deletions
+1
-19
app/mailers/base_mailer.rb
app/mailers/base_mailer.rb
+1
-19
No files found.
app/mailers/base_mailer.rb
View file @
0bc94198
class
EmailRejection
Mailer
<
ActionMailer
::
Base
class
Base
Mailer
<
ActionMailer
::
Base
add_template_helper
ApplicationHelper
add_template_helper
ApplicationHelper
add_template_helper
GitlabMarkdownHelper
add_template_helper
GitlabMarkdownHelper
...
@@ -12,24 +12,6 @@ class EmailRejectionMailer < ActionMailer::Base
...
@@ -12,24 +12,6 @@ class EmailRejectionMailer < ActionMailer::Base
delay_for
(
2
.
seconds
)
delay_for
(
2
.
seconds
)
end
end
def
rejection
(
reason
,
original_raw
,
can_retry
=
false
)
@reason
=
reason
@original_message
=
Mail
::
Message
.
new
(
original_raw
)
headers
=
{
to:
@original_message
.
from
,
subject:
"[Rejected]
#{
@original_message
.
subject
}
"
}
headers
[
'Message-ID'
]
=
SecureRandom
.
hex
headers
[
'In-Reply-To'
]
=
@original_message
.
message_id
headers
[
'References'
]
=
@original_message
.
message_id
headers
[
'Reply-To'
]
=
@original_message
.
to
.
first
if
can_retry
mail
(
headers
)
end
def
can?
def
can?
Ability
.
abilities
.
allowed?
(
user
,
action
,
subject
)
Ability
.
abilities
.
allowed?
(
user
,
action
,
subject
)
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