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
f92fd303
Commit
f92fd303
authored
Jan 17, 2017
by
Sean McGivern
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add text version of unapproval email
parent
6bf84768
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
app/mailers/emails/merge_requests.rb
app/mailers/emails/merge_requests.rb
+1
-1
No files found.
app/mailers/emails/merge_requests.rb
View file @
f92fd303
...
...
@@ -65,7 +65,7 @@ module Emails
def
unapproved_merge_request_email
(
recipient_id
,
merge_request_id
,
unapproved_by_user_id
)
setup_merge_request_mail
(
merge_request_id
,
recipient_id
)
@unapproved_by
=
User
.
find
(
approved_by_user_id
)
@unapproved_by
=
User
.
find
(
un
approved_by_user_id
)
@unapproved_by_users
=
@merge_request
.
approved_by_users
.
map
(
&
:name
)
mail_answer_thread
(
@merge_request
,
merge_request_thread_options
(
approved_by_user_id
,
recipient_id
))
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