diff options
| author | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-08-30 16:40:07 +0300 |
|---|---|---|
| committer | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-08-31 21:03:34 +0300 |
| commit | 446a7ce0b55f28547ea9243d3d072ecc776b6895 (patch) | |
| tree | 3808601b58dcba6df9d19d22c4cb857c6ff7e70c /app/services/merge_requests/build_service.rb | |
| parent | 4091c47f7278ccdfb2242ec9480d9e5d31294b1e (diff) | |
blocks file creation/updating while repository's size is above the limit
and adds some refactors
Diffstat (limited to 'app/services/merge_requests/build_service.rb')
| -rw-r--r-- | app/services/merge_requests/build_service.rb | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/app/services/merge_requests/build_service.rb b/app/services/merge_requests/build_service.rb index 43e7cd505eb..3666e23f9fa 100644 --- a/app/services/merge_requests/build_service.rb +++ b/app/services/merge_requests/build_service.rb @@ -29,7 +29,7 @@ module MergeRequests merge_request.errors.add(:base, message) unless message.nil? end - return build_failed(merge_request) if invalid?(merge_request) + return build_failed(merge_request) unless merge_request.valid? compare = CompareService.new.execute( merge_request.source_project, @@ -101,12 +101,6 @@ module MergeRequests merge_request end - def invalid?(merge_request) - merge_request.target_project.above_size_limit? || - merge_request.target_project.blank? || - merge_request.source_branch.blank? - end - def build_failed(merge_request) merge_request.compare_commits = [] merge_request.can_be_created = false |