diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 8 | ||||
| -rw-r--r-- | app/controllers/projects_controller.rb | 2 | ||||
| -rw-r--r-- | app/helpers/projects_helper.rb | 4 | ||||
| -rw-r--r-- | app/models/project.rb | 4 | ||||
| -rw-r--r-- | app/views/admin/projects/show.html.haml | 3 | ||||
| -rw-r--r-- | app/views/projects/edit.html.haml | 8 |
6 files changed, 20 insertions, 9 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 83500a687bb..f2db373da52 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -311,6 +311,14 @@ a.deploy-project-label { color: $gl-success; } +.lfs-enabled { + color: $gl-success; +} + +.lfs-disabled { + color: $gl-warning; +} + .breadcrumb.repo-breadcrumb { padding: 0; background: transparent; diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 678b56b5d9b..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, :enable_lfs + :public_builds, :only_allow_merge_if_build_succeeds, :request_access_enabled, :lfs_enabled ) end diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index a5ae9f8668e..f07077bd133 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -189,11 +189,11 @@ module ProjectsHelper def project_lfs_status(project) if project.lfs_enabled? - content_tag(:span, class: 'vs-private') do + content_tag(:span, class: 'lfs-enabled') do 'Enabled' end else - content_tag(:span, class: 'vs-internal') do + content_tag(:span, class: 'lfs-disabled') do 'Disabled' end end diff --git a/app/models/project.rb b/app/models/project.rb index 7a5933bfe5e..e5027af4a0e 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -392,9 +392,9 @@ class Project < ActiveRecord::Base def lfs_enabled? return false unless Gitlab.config.lfs.enabled - return Gitlab.config.lfs.enabled if enable_lfs.nil? + return Gitlab.config.lfs.enabled if self[:lfs_enabled].nil? - enable_lfs + self[:lfs_enabled] end def repository_storage_path diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml index f65322cc12f..6c7c3c48604 100644 --- a/app/views/admin/projects/show.html.haml +++ b/app/views/admin/projects/show.html.haml @@ -75,9 +75,10 @@ = last_commit(@project) %li - %span.light LFS status: + %span.light Git LFS status: %strong = project_lfs_status(@project) + = link_to icon('question-circle'), help_page_path('workflow/lfs/manage_large_binaries_with_git_lfs') - else %li %span.light repository: diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index 0c5ce193240..836c6d7b83f 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -83,11 +83,13 @@ - if Gitlab.config.lfs.enabled && current_user.admin? .form-group .checkbox - = f.label :enable_lfs do - = f.check_box :enable_lfs, checked: @project.lfs_enabled? + = f.label :lfs_enabled do + = f.check_box :lfs_enabled, checked: @project.lfs_enabled? %strong LFS %br - %span.descr Git Large File Storage + %span.descr + Git Large File Storage + = link_to icon('question-circle'), help_page_path('workflow/lfs/manage_large_binaries_with_git_lfs') - if Gitlab.config.registry.enabled .form-group .checkbox |