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
e553a046
Commit
e553a046
authored
Mar 10, 2020
by
Aleksei Lipniagov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Support both project_params[:params] checks based
parent
195ff2aa
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
1 deletion
+12
-1
app/controllers/import/gitlab_projects_controller.rb
app/controllers/import/gitlab_projects_controller.rb
+12
-1
No files found.
app/controllers/import/gitlab_projects_controller.rb
View file @
e553a046
...
...
@@ -48,7 +48,14 @@ class Import::GitlabProjectsController < Import::BaseController
private
def
file_is_valid?
return
false
unless
project_params
[
:file
]
# TODO: remove the condition and the private method after the WH version including
# https://gitlab.com/gitlab-org/gitlab-workhorse/-/merge_requests/470
# is released and GITLAB_WORKHORSE_VERSION is updated accordingly.
if
with_workhorse_upload_acceleration?
return
false
unless
project_params
[
:file
]
else
return
false
unless
project_params
[
:file
]
&&
project_params
[
:file
].
respond_to?
(
:read
)
end
filename
=
project_params
[
:file
].
original_filename
...
...
@@ -68,4 +75,8 @@ class Import::GitlabProjectsController < Import::BaseController
def
whitelist_query_limiting
Gitlab
::
QueryLimiting
.
whitelist
(
'https://gitlab.com/gitlab-org/gitlab-foss/issues/42437'
)
end
def
with_workhorse_upload_acceleration?
request
.
headers
[
Gitlab
::
Workhorse
::
INTERNAL_API_REQUEST_HEADER
].
present?
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