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
e300dac2
Commit
e300dac2
authored
Jul 15, 2016
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix LFS specs
parent
bb9f827d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
lib/gitlab/lfs/response.rb
lib/gitlab/lfs/response.rb
+2
-0
lib/gitlab/lfs/router.rb
lib/gitlab/lfs/router.rb
+0
-2
spec/requests/lfs_http_spec.rb
spec/requests/lfs_http_spec.rb
+1
-1
No files found.
lib/gitlab/lfs/response.rb
View file @
e300dac2
...
@@ -47,6 +47,8 @@ module Gitlab
...
@@ -47,6 +47,8 @@ module Gitlab
end
end
def
render_storage_upload_store_response
(
oid
,
size
,
tmp_file_name
)
def
render_storage_upload_store_response
(
oid
,
size
,
tmp_file_name
)
return
render_forbidden
unless
tmp_file_name
render_response_to_push
do
render_response_to_push
do
render_lfs_upload_ok
(
oid
,
size
,
tmp_file_name
)
render_lfs_upload_ok
(
oid
,
size
,
tmp_file_name
)
end
end
...
...
lib/gitlab/lfs/router.rb
View file @
e300dac2
...
@@ -74,8 +74,6 @@ module Gitlab
...
@@ -74,8 +74,6 @@ module Gitlab
lfs
.
render_storage_upload_authorize_response
(
oid
,
size
)
lfs
.
render_storage_upload_authorize_response
(
oid
,
size
)
else
else
tmp_file_name
=
sanitize_tmp_filename
(
@request
.
env
[
'HTTP_X_GITLAB_LFS_TMP'
])
tmp_file_name
=
sanitize_tmp_filename
(
@request
.
env
[
'HTTP_X_GITLAB_LFS_TMP'
])
return
nil
unless
tmp_file_name
lfs
.
render_storage_upload_store_response
(
oid
,
size
,
tmp_file_name
)
lfs
.
render_storage_upload_store_response
(
oid
,
size
,
tmp_file_name
)
end
end
end
end
...
...
spec/requests/lfs_http_spec.rb
View file @
e300dac2
...
@@ -557,7 +557,7 @@ describe Gitlab::Lfs::Router do
...
@@ -557,7 +557,7 @@ describe Gitlab::Lfs::Router do
end
end
it
'does not recognize it as a valid lfs command'
do
it
'does not recognize it as a valid lfs command'
do
expect
(
response
).
to
have_http_status
(
40
1
)
expect
(
response
).
to
have_http_status
(
40
3
)
end
end
end
end
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