BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
94668490
Commit
94668490
authored
Apr 10, 2017
by
Sean McGivern
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '30676-project-export-email' into 'master'
Fix email not being sent after project export Closes #30676 See merge request !10578
parents
c98add15
3a33a795
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
1 deletion
+17
-1
project_was_exported_email.html.haml
app/views/notify/project_was_exported_email.html.haml
+1
-1
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 @
94668490
...
...
@@ -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.
spec/services/notification_service_spec.rb
View file @
94668490
...
...
@@ -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
...
...
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