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
73446fe1
Commit
73446fe1
authored
Sep 11, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Email templates when user was added to group
parent
fc6ed495
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
37 additions
and
13 deletions
+37
-13
app/mailers/emails/groups.rb
app/mailers/emails/groups.rb
+11
-0
app/mailers/emails/profile.rb
app/mailers/emails/profile.rb
+15
-0
app/mailers/emails/projects.rb
app/mailers/emails/projects.rb
+0
-1
app/mailers/notify.rb
app/mailers/notify.rb
+2
-12
app/views/notify/group_access_granted_email.html.haml
app/views/notify/group_access_granted_email.html.haml
+5
-0
app/views/notify/group_access_granted_email.text.erb
app/views/notify/group_access_granted_email.text.erb
+4
-0
No files found.
app/mailers/emails/groups.rb
0 → 100644
View file @
73446fe1
module
Emails
module
Groups
def
group_access_granted_email
(
user_group_id
)
@membership
=
UsersGroup
.
find
(
user_group_id
)
@group
=
@membership
.
group
mail
(
to:
@membership
.
user
.
email
,
subject:
subject
(
"access to group was granted"
))
end
end
end
app/mailers/emails/profile.rb
0 → 100644
View file @
73446fe1
module
Emails
module
Profile
def
new_user_email
(
user_id
,
password
)
@user
=
User
.
find
(
user_id
)
@password
=
password
mail
(
to:
@user
.
email
,
subject:
subject
(
"Account was created for you"
))
end
def
new_ssh_key_email
(
key_id
)
@key
=
Key
.
find
(
key_id
)
@user
=
@key
.
user
mail
(
to:
@user
.
email
,
subject:
subject
(
"SSH key was added to your account"
))
end
end
end
app/mailers/emails/projects.rb
View file @
73446fe1
...
@@ -7,7 +7,6 @@ module Emails
...
@@ -7,7 +7,6 @@ module Emails
subject:
subject
(
"access to project was granted"
))
subject:
subject
(
"access to project was granted"
))
end
end
def
project_was_moved_email
(
project_id
,
user_id
)
def
project_was_moved_email
(
project_id
,
user_id
)
@user
=
User
.
find
user_id
@user
=
User
.
find
user_id
@project
=
Project
.
find
project_id
@project
=
Project
.
find
project_id
...
...
app/mailers/notify.rb
View file @
73446fe1
...
@@ -3,6 +3,8 @@ class Notify < ActionMailer::Base
...
@@ -3,6 +3,8 @@ class Notify < ActionMailer::Base
include
Emails
::
MergeRequests
include
Emails
::
MergeRequests
include
Emails
::
Notes
include
Emails
::
Notes
include
Emails
::
Projects
include
Emails
::
Projects
include
Emails
::
Profile
include
Emails
::
Groups
add_template_helper
ApplicationHelper
add_template_helper
ApplicationHelper
add_template_helper
GitlabMarkdownHelper
add_template_helper
GitlabMarkdownHelper
...
@@ -20,18 +22,6 @@ class Notify < ActionMailer::Base
...
@@ -20,18 +22,6 @@ class Notify < ActionMailer::Base
delay_for
(
2
.
seconds
)
delay_for
(
2
.
seconds
)
end
end
def
new_user_email
(
user_id
,
password
)
@user
=
User
.
find
(
user_id
)
@password
=
password
mail
(
to:
@user
.
email
,
subject:
subject
(
"Account was created for you"
))
end
def
new_ssh_key_email
(
key_id
)
@key
=
Key
.
find
(
key_id
)
@user
=
@key
.
user
mail
(
to:
@user
.
email
,
subject:
subject
(
"SSH key was added to your account"
))
end
private
private
# Look up a User by their ID and return their email address
# Look up a User by their ID and return their email address
...
...
app/views/notify/group_access_granted_email.html.haml
0 → 100644
View file @
73446fe1
%p
=
"You have been granted
#{
@membership
.
human_access
}
access to group"
%p
=
link_to
group_url
(
@group
)
do
=
@group
.
name
app/views/notify/group_access_granted_email.text.erb
0 → 100644
View file @
73446fe1
You have been granted
<%=
@membership
.
human_access
%>
access to group
<%=
@group
.
name
%>
<%=
url_for
(
group_url
(
@group
))
%>
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