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
Léo-Paul Géneau
gitlab-ce
Commits
2f585840
Commit
2f585840
authored
Mar 28, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed new mr/issue emails
parent
ecf3b2e4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
7 deletions
+12
-7
app/mailers/emails/issues.rb
app/mailers/emails/issues.rb
+2
-2
app/mailers/emails/merge_requests.rb
app/mailers/emails/merge_requests.rb
+2
-2
app/views/notify/new_issue_email.html.haml
app/views/notify/new_issue_email.html.haml
+5
-1
app/views/notify/new_issue_email.text.erb
app/views/notify/new_issue_email.text.erb
+3
-2
No files found.
app/mailers/emails/issues.rb
View file @
2f585840
module
Emails
module
Issues
def
new_issue_email
(
issue_id
)
def
new_issue_email
(
recipient_id
,
issue_id
)
@issue
=
Issue
.
find
(
issue_id
)
@project
=
@issue
.
project
mail
(
to:
@issue
.
assignee_email
,
subject:
subject
(
"new issue #
#{
@issue
.
id
}
"
,
@issue
.
title
))
mail
(
to:
recipient
(
recipient_id
)
,
subject:
subject
(
"new issue #
#{
@issue
.
id
}
"
,
@issue
.
title
))
end
def
reassigned_issue_email
(
recipient_id
,
issue_id
,
previous_assignee_id
)
...
...
app/mailers/emails/merge_requests.rb
View file @
2f585840
module
Emails
module
MergeRequests
def
new_merge_request_email
(
merge_request_id
)
def
new_merge_request_email
(
recipient_id
,
merge_request_id
)
@merge_request
=
MergeRequest
.
find
(
merge_request_id
)
@project
=
@merge_request
.
project
mail
(
to:
@merge_request
.
assignee_email
,
subject:
subject
(
"new merge request !
#{
@merge_request
.
id
}
"
,
@merge_request
.
title
))
mail
(
to:
recipient
(
recipient_id
)
,
subject:
subject
(
"new merge request !
#{
@merge_request
.
id
}
"
,
@merge_request
.
title
))
end
def
reassigned_merge_request_email
(
recipient_id
,
merge_request_id
,
previous_assignee_id
)
...
...
app/views/notify/new_issue_email.html.haml
View file @
2f585840
%p
New Issue was created
and assigned to you
.
New Issue was created.
%p
=
"Issue #
#{
@issue
.
id
}
"
=
link_to_gfm
truncate
(
@issue
.
title
,
length:
45
),
project_issue_url
(
@issue
.
project
,
@issue
),
title:
@issue
.
title
%p
Author:
#{
@issue
.
author_name
}
%p
Assignee:
#{
@issue
.
assignee_name
}
app/views/notify/new_issue_email.text.erb
View file @
2f585840
New Issue was created
and assigned to you
.
New Issue was created.
Issue
<%=
@issue
.
id
%>
:
<%=
url_for
(
project_issue_url
(
@issue
.
project
,
@issue
))
%>
Author:
<%=
@issue
.
author_name
%>
Asignee:
<%=
@issue
.
assignee_name
%>
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