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
Boxiang Sun
gitlab-ce
Commits
3a33a795
Commit
3a33a795
authored
Apr 09, 2017
by
mhasbini
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix email not being sent after project export
parent
3d1cade1
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
1 deletion
+17
-1
app/views/notify/project_was_exported_email.html.haml
app/views/notify/project_was_exported_email.html.haml
+1
-1
spec/services/notification_service_spec.rb
spec/services/notification_service_spec.rb
+16
-0
No files found.
app/views/notify/project_was_exported_email.html.haml
View file @
3a33a795
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
Project
#{
@project
.
name
}
was exported successfully.
Project
#{
@project
.
name
}
was exported successfully.
%p
%p
The project export can be downloaded from:
The project export can be downloaded from:
=
link_to
download_export_namespace_project_url
(
@project
.
namespace
,
@project
),
rel:
'nofollow'
,
download:
''
,
do
=
link_to
download_export_namespace_project_url
(
@project
.
namespace
,
@project
),
rel:
'nofollow'
,
download:
''
do
=
@project
.
name_with_namespace
+
" export"
=
@project
.
name_with_namespace
+
" export"
%p
%p
The download link will expire in 24 hours.
The download link will expire in 24 hours.
spec/services/notification_service_spec.rb
View file @
3a33a795
...
@@ -1181,6 +1181,22 @@ describe NotificationService, services: true do
...
@@ -1181,6 +1181,22 @@ describe NotificationService, services: true do
should_not_email
(
@u_disabled
)
should_not_email
(
@u_disabled
)
end
end
end
end
describe
'#project_exported'
do
it
do
notification
.
project_exported
(
project
,
@u_disabled
)
should_only_email
(
@u_disabled
)
end
end
describe
'#project_not_exported'
do
it
do
notification
.
project_not_exported
(
project
,
@u_disabled
,
[
'error'
])
should_only_email
(
@u_disabled
)
end
end
end
end
describe
'GroupMember'
do
describe
'GroupMember'
do
...
...
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