diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-08-30 23:01:26 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-08-30 23:01:26 +0000 |
| commit | 88295e07426698ce2af32af73ac0c34e540a0ba0 (patch) | |
| tree | 4f2a54fd0bd29130b92500b9d33c5c1f6b3c28c6 /app/controllers | |
| parent | 1e08429d2c9aa72918a0a3328d070f0768478463 (diff) | |
| parent | cf37d623e197dae5cc7efb021c1b1d85ca9674ee (diff) | |
| download | gitlab-ce-88295e07426698ce2af32af73ac0c34e540a0ba0.tar.gz | |
Merge branch 'project-specific-lfs' into 'master'
Added project specific enable/disable setting for LFS
## What does this MR do?
Adds project specific enable/disable setting for LFS
## What are the relevant issue numbers?
Needed for #18092
See merge request !5997
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index fc52cd2f367..84d6b106cd7 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -309,7 +309,7 @@ class ProjectsController < Projects::ApplicationController :issues_tracker_id, :default_branch, :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, - :public_builds, :only_allow_merge_if_build_succeeds, :request_access_enabled + :public_builds, :only_allow_merge_if_build_succeeds, :request_access_enabled, :lfs_enabled ) end |