summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-04-10 10:01:34 +0000
committerLin Jen-Shin <godfat@godfat.org>2017-04-24 15:49:06 +0800
commit5f1535fdc61617448544b6f411fe2d828c744fe9 (patch)
tree1c12447020947c8925ec4d5aaa8b720dd30f8ad0
parentc3f0f1430dd6736ec698b87421534f1768017262 (diff)
downloadgitlab-ce-5f1535fdc61617448544b6f411fe2d828c744fe9.tar.gz
Merge branch '30676-project-export-email' into 'master'
Fix email not being sent after project export Closes #30676 See merge request !10578
-rw-r--r--app/views/notify/project_was_exported_email.html.haml2
-rw-r--r--spec/services/notification_service_spec.rb16
2 files changed, 17 insertions, 1 deletions
diff --git a/app/views/notify/project_was_exported_email.html.haml b/app/views/notify/project_was_exported_email.html.haml
index 76440926a2b..3def26342a1 100644
--- a/app/views/notify/project_was_exported_email.html.haml
+++ b/app/views/notify/project_was_exported_email.html.haml
@@ -2,7 +2,7 @@
Project #{@project.name} was exported successfully.
%p
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"
%p
The download link will expire in 24 hours.
diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb
index 617c8eaf3d5..989fd90cda9 100644
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -1181,6 +1181,22 @@ describe NotificationService, services: true do
should_not_email(@u_disabled)
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
describe 'GroupMember' do