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
4c7f2391
Commit
4c7f2391
authored
Jul 18, 2018
by
Jasper Maes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rails5 fix no implicit conversion of Symbol into Integer
parent
3090c6b1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
3 deletions
+8
-3
ee/app/controllers/ee/projects/issues_controller.rb
ee/app/controllers/ee/projects/issues_controller.rb
+1
-1
ee/changelogs/unreleased/rails5-fix-6930.yml
ee/changelogs/unreleased/rails5-fix-6930.yml
+5
-0
ee/spec/features/issues/csv_spec.rb
ee/spec/features/issues/csv_spec.rb
+2
-2
No files found.
ee/app/controllers/ee/projects/issues_controller.rb
View file @
4c7f2391
...
@@ -16,7 +16,7 @@ module EE
...
@@ -16,7 +16,7 @@ module EE
end
end
def
export_csv
def
export_csv
ExportCsvWorker
.
perform_async
(
current_user
.
id
,
project
.
id
,
filter_params
)
ExportCsvWorker
.
perform_async
(
current_user
.
id
,
project
.
id
,
filter_params
.
to_h
)
index_path
=
project_issues_path
(
project
)
index_path
=
project_issues_path
(
project
)
redirect_to
(
index_path
,
notice:
"Your CSV export has started. It will be emailed to
#{
current_user
.
notification_email
}
when complete."
)
redirect_to
(
index_path
,
notice:
"Your CSV export has started. It will be emailed to
#{
current_user
.
notification_email
}
when complete."
)
...
...
ee/changelogs/unreleased/rails5-fix-6930.yml
0 → 100644
View file @
4c7f2391
---
title
:
Rails5 fix no implicit conversion of Symbol into Integer
merge_request
:
6582
author
:
Jasper Maes
type
:
fixed
ee/spec/features/issues/csv_spec.rb
View file @
4c7f2391
...
@@ -29,13 +29,13 @@ describe 'Issues csv' do
...
@@ -29,13 +29,13 @@ describe 'Issues csv' do
end
end
it
'triggers an email export'
do
it
'triggers an email export'
do
expect
(
ExportCsvWorker
).
to
receive
(
:perform_async
).
with
(
user
.
id
,
project
.
id
,
hash_including
(
project_id:
project
.
id
))
expect
(
ExportCsvWorker
).
to
receive
(
:perform_async
).
with
(
user
.
id
,
project
.
id
,
hash_including
(
"project_id"
=>
project
.
id
))
request_csv
request_csv
end
end
it
"doesn't send request params to ExportCsvWorker"
do
it
"doesn't send request params to ExportCsvWorker"
do
expect
(
ExportCsvWorker
).
to
receive
(
:perform_async
).
with
(
anything
,
anything
,
hash_excluding
(
controller:
anything
,
action:
anything
))
expect
(
ExportCsvWorker
).
to
receive
(
:perform_async
).
with
(
anything
,
anything
,
hash_excluding
(
"controller"
=>
anything
,
"action"
=>
anything
))
request_csv
request_csv
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