diff options
| author | Adam Niedzielski <adamsunday@gmail.com> | 2016-11-18 14:33:42 +0100 |
|---|---|---|
| committer | Adam Niedzielski <adamsunday@gmail.com> | 2016-11-21 13:26:26 +0100 |
| commit | e22514fd4c54ec05e3272afdba5cba27d5b70516 (patch) | |
| tree | 04f55603e0bef6da1ffc7e72008643514dea0265 /app/models/merge_request_diff.rb | |
| parent | 9e9965ba5ce5a2acca97325412c63eed398ef80b (diff) | |
| download | gitlab-ce-e22514fd4c54ec05e3272afdba5cba27d5b70516.tar.gz | |
Hide empty merge request diffs when comparing versions
Diffstat (limited to 'app/models/merge_request_diff.rb')
| -rw-r--r-- | app/models/merge_request_diff.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb index dd65a9a8b86..58a24eb84cb 100644 --- a/app/models/merge_request_diff.rb +++ b/app/models/merge_request_diff.rb @@ -11,6 +11,9 @@ class MergeRequestDiff < ActiveRecord::Base belongs_to :merge_request + serialize :st_commits + serialize :st_diffs + state_machine :state, initial: :empty do state :collected state :overflow @@ -22,8 +25,7 @@ class MergeRequestDiff < ActiveRecord::Base state :overflow_diff_lines_limit end - serialize :st_commits - serialize :st_diffs + scope :viewable, -> { without_state(:empty) } # All diff information is collected from repository after object is created. # It allows you to override variables like head_commit_sha before getting diff. |