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
7e37b6ef
Commit
7e37b6ef
authored
Jan 13, 2021
by
Małgorzata Ksionek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add cr remarks
parent
b9469a3a
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
6 additions
and
6 deletions
+6
-6
app/views/notify/provisioned_member_access_granted_email.erb
app/views/notify/provisioned_member_access_granted_email.erb
+0
-0
app/views/notify/provisioned_member_access_granted_email.haml
...views/notify/provisioned_member_access_granted_email.haml
+0
-0
ee/app/mailers/ee/emails/members.rb
ee/app/mailers/ee/emails/members.rb
+1
-1
ee/app/mailers/ee/preview/notify_preview.rb
ee/app/mailers/ee/preview/notify_preview.rb
+1
-1
ee/app/services/ee/notification_service.rb
ee/app/services/ee/notification_service.rb
+1
-1
ee/spec/mailers/notify_spec.rb
ee/spec/mailers/notify_spec.rb
+3
-3
No files found.
app/views/notify/
member_access_granted_email_with_confirmation.text
.erb
→
app/views/notify/
provisioned_member_access_granted_email
.erb
View file @
7e37b6ef
File moved
app/views/notify/
member_access_granted_email_with_confirmation.htm
l.haml
→
app/views/notify/
provisioned_member_access_granted_emai
l.haml
View file @
7e37b6ef
File moved
ee/app/mailers/ee/emails/members.rb
View file @
7e37b6ef
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
module
EE
module
EE
module
Emails
module
Emails
module
Members
module
Members
def
member_access_granted_email_with_confirmation
(
member_id
)
def
provisioned_member_access_granted_email
(
member_id
)
@member_id
=
member_id
@member_id
=
member_id
return
unless
member_exists?
return
unless
member_exists?
...
...
ee/app/mailers/ee/preview/notify_preview.rb
View file @
7e37b6ef
...
@@ -52,7 +52,7 @@ module EE
...
@@ -52,7 +52,7 @@ module EE
end
end
def
new_group_member_with_confirmation_email
def
new_group_member_with_confirmation_email
::
Notify
.
member_access_granted_email_with_confirmation
(
member
.
id
).
message
::
Notify
.
provisioned_member_access_granted_email
(
member
.
id
).
message
end
end
end
end
...
...
ee/app/services/ee/notification_service.rb
View file @
7e37b6ef
...
@@ -63,7 +63,7 @@ module EE
...
@@ -63,7 +63,7 @@ module EE
end
end
def
new_group_member_with_confirmation
(
group_member
)
def
new_group_member_with_confirmation
(
group_member
)
mailer
.
member_access_granted_email_with_confirmation
(
group_member
.
id
).
deliver_later
mailer
.
provisioned_member_access_granted_email
(
group_member
.
id
).
deliver_later
end
end
private
private
...
...
ee/spec/mailers/notify_spec.rb
View file @
7e37b6ef
...
@@ -375,7 +375,7 @@ RSpec.describe Notify do
...
@@ -375,7 +375,7 @@ RSpec.describe Notify do
let
(
:group
)
{
group_member
.
source
}
let
(
:group
)
{
group_member
.
source
}
let
(
:recipient
)
{
group_member
.
user
}
let
(
:recipient
)
{
group_member
.
user
}
subject
{
described_class
.
member_access_granted_email_with_confirmation
(
group_member
.
id
)
}
subject
{
described_class
.
provisioned_member_access_granted_email
(
group_member
.
id
)
}
it_behaves_like
'an email sent from GitLab'
it_behaves_like
'an email sent from GitLab'
it_behaves_like
'it should not have Gmail Actions links'
it_behaves_like
'it should not have Gmail Actions links'
...
@@ -388,12 +388,12 @@ RSpec.describe Notify do
...
@@ -388,12 +388,12 @@ RSpec.describe Notify do
end
end
it
'contains all the useful information'
do
it
'contains all the useful information'
do
is_expected
.
to
have_subject
"Welcome to GitLab"
is_expected
.
to
have_subject
'Welcome to GitLab'
is_expected
.
to
have_body_text
group
.
name
is_expected
.
to
have_body_text
group
.
name
is_expected
.
to
have_body_text
group
.
web_url
is_expected
.
to
have_body_text
group
.
web_url
is_expected
.
to
have_body_text
recipient
.
username
is_expected
.
to
have_body_text
recipient
.
username
is_expected
.
to
have_body_text
recipient
.
email
is_expected
.
to
have_body_text
recipient
.
email
is_expected
.
to
have_body_text
'
C
onfirm your account'
is_expected
.
to
have_body_text
'
To get started, click the link below to c
onfirm your account'
is_expected
.
to
have_body_text
recipient
.
confirmation_token
is_expected
.
to
have_body_text
recipient
.
confirmation_token
end
end
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