From 63a97c11928d483cfad87d11f83c7df84c29743d Mon Sep 17 00:00:00 2001 From: Patricio Cano Date: Thu, 25 Aug 2016 17:59:31 -0500 Subject: Syntax and style fixes. --- app/models/project.rb | 5 ++++- app/views/projects/edit.html.haml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'app') diff --git a/app/models/project.rb b/app/models/project.rb index c271448946c..7a5933bfe5e 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -391,7 +391,10 @@ class Project < ActiveRecord::Base end def lfs_enabled? - (Gitlab.config.lfs.enabled && enable_lfs) || (enable_lfs.nil? && Gitlab.config.lfs.enabled) + return false unless Gitlab.config.lfs.enabled + return Gitlab.config.lfs.enabled if enable_lfs.nil? + + enable_lfs end def repository_storage_path diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index 8aa2db197a3..0c5ce193240 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -84,7 +84,7 @@ .form-group .checkbox = f.label :enable_lfs do - = f.check_box :enable_lfs, checked: (true if @project.enable_lfs || @project.enable_lfs.nil?) + = f.check_box :enable_lfs, checked: @project.lfs_enabled? %strong LFS %br %span.descr Git Large File Storage -- cgit v1.2.3