summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorPatricio Cano <suprnova32@gmail.com>2016-08-30 17:17:45 -0500
committerPatricio Cano <suprnova32@gmail.com>2016-08-30 17:17:45 -0500
commitcf37d623e197dae5cc7efb021c1b1d85ca9674ee (patch)
treee785be171d2400ef751426cc79757cca320f856b /lib
parent63a97c11928d483cfad87d11f83c7df84c29743d (diff)
downloadgitlab-ce-cf37d623e197dae5cc7efb021c1b1d85ca9674ee.tar.gz
Renamed `enable_lfs` to `lfs_enabled` for the Project field, and related fixes.project-specific-lfs
Diffstat (limited to 'lib')
-rw-r--r--lib/api/entities.rb2
-rw-r--r--lib/api/projects.rb12
2 files changed, 8 insertions, 6 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 61fcccf2959..4335e3055ef 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -78,7 +78,7 @@ module API
expose :path, :path_with_namespace
expose :issues_enabled, :merge_requests_enabled, :wiki_enabled, :builds_enabled, :snippets_enabled, :container_registry_enabled
expose :created_at, :last_activity_at
- expose :shared_runners_enabled, :enable_lfs
+ expose :shared_runners_enabled, :lfs_enabled
expose :creator_id
expose :namespace
expose :forked_from_project, using: Entities::BasicProjectDetails, if: lambda{ |project, options| project.forked? }
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index d98fb2611ff..f8979a1cc29 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -105,7 +105,7 @@ module API
# visibility_level (optional) - 0 by default
# import_url (optional)
# public_builds (optional)
- # enable_lfs (optional)
+ # lfs_enabled (optional)
# Example Request
# POST /projects
post do
@@ -126,7 +126,7 @@ module API
:import_url,
:public_builds,
:only_allow_merge_if_build_succeeds,
- :enable_lfs]
+ :lfs_enabled]
attrs = map_public_to_visibility_level(attrs)
@project = ::Projects::CreateService.new(current_user, attrs).execute
if @project.saved?
@@ -158,6 +158,7 @@ module API
# visibility_level (optional)
# import_url (optional)
# public_builds (optional)
+ # lfs_enabled (optional)
# Example Request
# POST /projects/user/:user_id
post "user/:user_id" do
@@ -176,7 +177,8 @@ module API
:visibility_level,
:import_url,
:public_builds,
- :only_allow_merge_if_build_succeeds]
+ :only_allow_merge_if_build_succeeds,
+ :lfs_enabled]
attrs = map_public_to_visibility_level(attrs)
@project = ::Projects::CreateService.new(user, attrs).execute
if @project.saved?
@@ -222,7 +224,7 @@ module API
# public (optional) - if true same as setting visibility_level = 20
# visibility_level (optional) - visibility level of a project
# public_builds (optional)
- # enable_lfs (optional)
+ # lfs_enabled (optional)
# Example Request
# PUT /projects/:id
put ':id' do
@@ -241,7 +243,7 @@ module API
:visibility_level,
:public_builds,
:only_allow_merge_if_build_succeeds,
- :enable_lfs]
+ :lfs_enabled]
attrs = map_public_to_visibility_level(attrs)
authorize_admin_project
authorize! :rename_project, user_project if attrs[:name].present?