diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-03-02 17:34:29 +0100 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-03-02 17:34:29 +0100 |
| commit | a10ab9b2783254d48d97891ffd83bcfb36a8d4a2 (patch) | |
| tree | 9107c2d5964f6feec71218189e910ca0aa73fcc4 | |
| parent | 581b0c8f93ac6c2dd8df504bbc522a6777a1a222 (diff) | |
| download | gitlab-ce-a10ab9b2783254d48d97891ffd83bcfb36a8d4a2.tar.gz | |
Remove write-only MergeRequestDiff states
| -rw-r--r-- | app/models/merge_request_diff.rb | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb index d17024bd872..afd13b505ff 100644 --- a/app/models/merge_request_diff.rb +++ b/app/models/merge_request_diff.rb @@ -16,19 +16,12 @@ require Rails.root.join("app/models/commit") class MergeRequestDiff < ActiveRecord::Base include Sortable - # Prevent store of diff if commits amount more then 500 - COMMITS_SAFE_SIZE = 500 - belongs_to :merge_request delegate :target_branch, :source_branch, to: :merge_request, prefix: nil state_machine :state, initial: :empty do state :collected - state :timeout - state :overflow_commits_safe_size - state :overflow_diff_files_limit - state :overflow_diff_lines_limit end serialize :st_commits @@ -137,13 +130,9 @@ class MergeRequestDiff < ActiveRecord::Base if commits.size.zero? self.state = :empty - elsif commits.size > COMMITS_SAFE_SIZE - self.state = :overflow_commits_safe_size else diff_collection = unmerged_diffs - self.state = :overflow_diff_files_limit if diff_collection.too_many_files? - self.state = :overflow_diff_lines_limit if diff_collection.too_many_lines? self.real_size = diff_collection.real_size if diff_collection.any? |
