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
a286a024
Commit
a286a024
authored
Jun 12, 2018
by
Sean McGivern
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove EE-specific code from rejection mailer
parent
d4d86f93
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
16 deletions
+13
-16
app/views/email_rejection_mailer/rejection.html.haml
app/views/email_rejection_mailer/rejection.html.haml
+1
-9
app/views/email_rejection_mailer/rejection.text.haml
app/views/email_rejection_mailer/rejection.text.haml
+1
-7
ee/app/views/shared/_additional_email_text.html.haml
ee/app/views/shared/_additional_email_text.html.haml
+7
-0
ee/app/views/shared/_additional_email_text.text.haml
ee/app/views/shared/_additional_email_text.text.haml
+4
-0
No files found.
app/views/email_rejection_mailer/rejection.html.haml
View file @
a286a024
...
...
@@ -2,12 +2,4 @@
Unfortunately, your email message to GitLab could not be processed.
=
markdown
@reason
-# EE-specific start
-
if
Gitlab
::
CurrentSettings
.
email_additional_text
.
present?
%p
—
%br
%br
=
Gitlab
::
Utils
.
nlbr
(
Gitlab
::
CurrentSettings
.
email_additional_text
)
-# EE-specific end
=
render_if_exists
'shared/additional_email_text'
app/views/email_rejection_mailer/rejection.text.haml
View file @
a286a024
Unfortunately, your email message to GitLab could not be processed.
\
=
@reason
-# EE-specific start
-
if
Gitlab
::
CurrentSettings
.
email_additional_text
.
present?
\
=
'---'
=
Gitlab
::
Utils
.
nlbr
(
Gitlab
::
CurrentSettings
.
email_additional_text
)
-# EE-specific end
=
render_if_exists
'shared/additional_email_text'
ee/app/views/shared/_additional_email_text.html.haml
0 → 100644
View file @
a286a024
-
return
unless
Gitlab
::
CurrentSettings
.
email_additional_text
.
present?
%p
—
%br
%br
=
Gitlab
::
Utils
.
nlbr
(
Gitlab
::
CurrentSettings
.
email_additional_text
)
ee/app/views/shared/_additional_email_text.text.haml
0 → 100644
View file @
a286a024
-
return
unless
Gitlab
::
CurrentSettings
.
email_additional_text
.
present?
\
=
'---'
=
Gitlab
::
Utils
.
nlbr
(
Gitlab
::
CurrentSettings
.
email_additional_text
)
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