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
9d8fbcc0
Commit
9d8fbcc0
authored
Aug 24, 2016
by
Patricio Cano
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added project specific enable/disable setting for LFS
parent
dafbcf63
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
171 additions
and
1 deletion
+171
-1
app/controllers/projects_controller.rb
app/controllers/projects_controller.rb
+1
-1
app/helpers/lfs_helper.rb
app/helpers/lfs_helper.rb
+4
-0
app/helpers/projects_helper.rb
app/helpers/projects_helper.rb
+12
-0
app/models/project.rb
app/models/project.rb
+4
-0
app/views/admin/projects/show.html.haml
app/views/admin/projects/show.html.haml
+5
-0
app/views/projects/edit.html.haml
app/views/projects/edit.html.haml
+8
-0
db/migrate/20160823213309_add_enable_lfs_to_projects.rb
db/migrate/20160823213309_add_enable_lfs_to_projects.rb
+29
-0
db/schema.rb
db/schema.rb
+1
-0
spec/requests/lfs_http_spec.rb
spec/requests/lfs_http_spec.rb
+107
-0
No files found.
app/controllers/projects_controller.rb
View file @
9d8fbcc0
...
@@ -309,7 +309,7 @@ class ProjectsController < Projects::ApplicationController
...
@@ -309,7 +309,7 @@ class ProjectsController < Projects::ApplicationController
:issues_tracker_id
,
:default_branch
,
:issues_tracker_id
,
:default_branch
,
:wiki_enabled
,
:visibility_level
,
:import_url
,
:last_activity_at
,
:namespace_id
,
:avatar
,
:wiki_enabled
,
:visibility_level
,
:import_url
,
:last_activity_at
,
:namespace_id
,
:avatar
,
:builds_enabled
,
:build_allow_git_fetch
,
:build_timeout_in_minutes
,
:build_coverage_regex
,
:builds_enabled
,
:build_allow_git_fetch
,
:build_timeout_in_minutes
,
:build_coverage_regex
,
:public_builds
,
:only_allow_merge_if_build_succeeds
,
:request_access_enabled
:public_builds
,
:only_allow_merge_if_build_succeeds
,
:request_access_enabled
,
:enable_lfs
)
)
end
end
...
...
app/helpers/lfs_helper.rb
View file @
9d8fbcc0
...
@@ -23,10 +23,14 @@ module LfsHelper
...
@@ -23,10 +23,14 @@ module LfsHelper
end
end
def
lfs_download_access?
def
lfs_download_access?
return
false
unless
project
.
lfs_enabled?
project
.
public?
||
ci?
||
(
user
&&
user
.
can?
(
:download_code
,
project
))
project
.
public?
||
ci?
||
(
user
&&
user
.
can?
(
:download_code
,
project
))
end
end
def
lfs_upload_access?
def
lfs_upload_access?
return
false
unless
project
.
lfs_enabled?
user
&&
user
.
can?
(
:push_code
,
project
)
user
&&
user
.
can?
(
:push_code
,
project
)
end
end
...
...
app/helpers/projects_helper.rb
View file @
9d8fbcc0
...
@@ -187,6 +187,18 @@ module ProjectsHelper
...
@@ -187,6 +187,18 @@ module ProjectsHelper
nav_tabs
.
flatten
nav_tabs
.
flatten
end
end
def
project_lfs_status
(
project
)
if
project
.
lfs_enabled?
content_tag
(
:span
,
class:
'vs-private'
)
do
'Enabled'
end
else
content_tag
(
:span
,
class:
'vs-internal'
)
do
'Disabled'
end
end
end
def
git_user_name
def
git_user_name
if
current_user
if
current_user
current_user
.
name
current_user
.
name
...
...
app/models/project.rb
View file @
9d8fbcc0
...
@@ -390,6 +390,10 @@ class Project < ActiveRecord::Base
...
@@ -390,6 +390,10 @@ class Project < ActiveRecord::Base
end
end
end
end
def
lfs_enabled?
(
Gitlab
.
config
.
lfs
.
enabled
&&
enable_lfs
)
||
(
enable_lfs
.
nil?
&&
Gitlab
.
config
.
lfs
.
enabled
)
end
def
repository_storage_path
def
repository_storage_path
Gitlab
.
config
.
repositories
.
storages
[
repository_storage
]
Gitlab
.
config
.
repositories
.
storages
[
repository_storage
]
end
end
...
...
app/views/admin/projects/show.html.haml
View file @
9d8fbcc0
...
@@ -73,6 +73,11 @@
...
@@ -73,6 +73,11 @@
%span
.light
last commit:
%span
.light
last commit:
%strong
%strong
=
last_commit
(
@project
)
=
last_commit
(
@project
)
%li
%span
.light
LFS status:
%strong
=
project_lfs_status
(
@project
)
-
else
-
else
%li
%li
%span
.light
repository:
%span
.light
repository:
...
...
app/views/projects/edit.html.haml
View file @
9d8fbcc0
...
@@ -80,6 +80,14 @@
...
@@ -80,6 +80,14 @@
%strong
Snippets
%strong
Snippets
%br
%br
%span
.descr
Share code pastes with others out of git repository
%span
.descr
Share code pastes with others out of git repository
-
if
Gitlab
.
config
.
lfs
.
enabled
&&
current_user
.
admin?
.form-group
.checkbox
=
f
.
label
:enable_lfs
do
=
f
.
check_box
:enable_lfs
,
checked:
(
true
if
@project
.
enable_lfs
||
@project
.
enable_lfs
.
nil?
)
%strong
LFS
%br
%span
.descr
Git Large File Storage
-
if
Gitlab
.
config
.
registry
.
enabled
-
if
Gitlab
.
config
.
registry
.
enabled
.form-group
.form-group
.checkbox
.checkbox
...
...
db/migrate/20160823213309_add_enable_lfs_to_projects.rb
0 → 100644
View file @
9d8fbcc0
# See http://doc.gitlab.com/ce/development/migration_style_guide.html
# for more information on how to write migrations for GitLab.
class
AddEnableLfsToProjects
<
ActiveRecord
::
Migration
include
Gitlab
::
Database
::
MigrationHelpers
# Set this constant to true if this migration requires downtime.
DOWNTIME
=
false
# When a migration requires downtime you **must** uncomment the following
# constant and define a short and easy to understand explanation as to why the
# migration requires downtime.
# DOWNTIME_REASON = ''
# When using the methods "add_concurrent_index" or "add_column_with_default"
# you must disable the use of transactions as these methods can not run in an
# existing transaction. When using "add_concurrent_index" make sure that this
# method is the _only_ method called in the migration, any other changes
# should go in a separate migration. This ensures that upon failure _only_ the
# index creation fails and can be retried or reverted easily.
#
# To disable transactions uncomment the following line and remove these
# comments:
# disable_ddl_transaction!
def
change
add_column
:projects
,
:enable_lfs
,
:boolean
end
end
db/schema.rb
View file @
9d8fbcc0
...
@@ -825,6 +825,7 @@ ActiveRecord::Schema.define(version: 20160824103857) do
...
@@ -825,6 +825,7 @@ ActiveRecord::Schema.define(version: 20160824103857) do
t
.
string
"repository_storage"
,
default:
"default"
,
null:
false
t
.
string
"repository_storage"
,
default:
"default"
,
null:
false
t
.
boolean
"request_access_enabled"
,
default:
true
,
null:
false
t
.
boolean
"request_access_enabled"
,
default:
true
,
null:
false
t
.
boolean
"has_external_wiki"
t
.
boolean
"has_external_wiki"
t
.
boolean
"enable_lfs"
end
end
add_index
"projects"
,
[
"ci_id"
],
name:
"index_projects_on_ci_id"
,
using: :btree
add_index
"projects"
,
[
"ci_id"
],
name:
"index_projects_on_ci_id"
,
using: :btree
...
...
spec/requests/lfs_http_spec.rb
View file @
9d8fbcc0
...
@@ -44,6 +44,113 @@ describe 'Git LFS API and storage' do
...
@@ -44,6 +44,113 @@ describe 'Git LFS API and storage' do
end
end
end
end
context
'project specific LFS settings'
do
let
(
:project
)
{
create
(
:empty_project
)
}
let
(
:body
)
do
{
'objects'
=>
[
{
'oid'
=>
'91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897'
,
'size'
=>
1575078
},
{
'oid'
=>
sample_oid
,
'size'
=>
sample_size
}
],
'operation'
=>
'upload'
}
end
let
(
:authorization
)
{
authorize_user
}
context
'with LFS disabled globally'
do
before
do
project
.
team
<<
[
user
,
:master
]
allow
(
Gitlab
.
config
.
lfs
).
to
receive
(
:enabled
).
and_return
(
false
)
end
describe
'LFS disabled in project'
do
before
do
project
.
update_attribute
(
:enable_lfs
,
false
)
end
it
'responds with a 501 message on upload'
do
post_lfs_json
"
#{
project
.
http_url_to_repo
}
/info/lfs/objects/batch"
,
body
,
headers
expect
(
response
).
to
have_http_status
(
501
)
end
it
'responds with a 501 message on download'
do
get
"
#{
project
.
http_url_to_repo
}
/gitlab-lfs/objects/
#{
sample_oid
}
"
,
nil
,
headers
expect
(
response
).
to
have_http_status
(
501
)
end
end
describe
'LFS enabled in project'
do
before
do
project
.
update_attribute
(
:enable_lfs
,
true
)
end
it
'responds with a 501 message on upload'
do
post_lfs_json
"
#{
project
.
http_url_to_repo
}
/info/lfs/objects/batch"
,
body
,
headers
expect
(
response
).
to
have_http_status
(
501
)
end
it
'responds with a 501 message on download'
do
get
"
#{
project
.
http_url_to_repo
}
/gitlab-lfs/objects/
#{
sample_oid
}
"
,
nil
,
headers
expect
(
response
).
to
have_http_status
(
501
)
end
end
end
context
'with LFS enabled globally'
do
before
do
project
.
team
<<
[
user
,
:master
]
enable_lfs
end
describe
'LFS disabled in project'
do
before
do
project
.
update_attribute
(
:enable_lfs
,
false
)
end
it
'responds with a 403 message on upload'
do
post_lfs_json
"
#{
project
.
http_url_to_repo
}
/info/lfs/objects/batch"
,
body
,
headers
expect
(
response
).
to
have_http_status
(
403
)
expect
(
json_response
).
to
include
(
'message'
=>
'Access forbidden. Check your access level.'
)
end
it
'responds with a 403 message on download'
do
get
"
#{
project
.
http_url_to_repo
}
/gitlab-lfs/objects/
#{
sample_oid
}
"
,
nil
,
headers
expect
(
response
).
to
have_http_status
(
403
)
expect
(
json_response
).
to
include
(
'message'
=>
'Access forbidden. Check your access level.'
)
end
end
describe
'LFS enabled in project'
do
before
do
project
.
update_attribute
(
:enable_lfs
,
true
)
end
it
'responds with a 200 message on upload'
do
post_lfs_json
"
#{
project
.
http_url_to_repo
}
/info/lfs/objects/batch"
,
body
,
headers
expect
(
response
).
to
have_http_status
(
200
)
expect
(
json_response
[
'objects'
].
first
[
'size'
]).
to
eq
(
1575078
)
end
it
'responds with a 200 message on download'
do
get
"
#{
project
.
http_url_to_repo
}
/gitlab-lfs/objects/
#{
sample_oid
}
"
,
nil
,
headers
expect
(
response
).
to
have_http_status
(
200
)
end
end
end
end
describe
'deprecated API'
do
describe
'deprecated API'
do
let
(
:project
)
{
create
(
:empty_project
)
}
let
(
:project
)
{
create
(
:empty_project
)
}
...
...
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