diff options
| author | Paco Guzman <pacoguzmanp@gmail.com> | 2016-08-11 09:00:17 +0200 |
|---|---|---|
| committer | Paco Guzman <pacoguzmanp@gmail.com> | 2016-10-06 11:19:14 +0200 |
| commit | ca3c0c6cd915d44ec2d409b04ab05d964bd5a403 (patch) | |
| tree | 0da5663e795e68d0f9d4c0760d910f5da6973afe /app/models/merge_request.rb | |
| parent | 0bbeff3d5e6c1b5ea3b364f052ed6f777c3aa645 (diff) | |
| download | gitlab-ce-ca3c0c6cd915d44ec2d409b04ab05d964bd5a403.tar.gz | |
MergeRequest new form load diff asynchronouslynew-merge-requests-commit-tab-active
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 071dfe54ef9..a743bf313ae 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -31,7 +31,7 @@ class MergeRequest < ActiveRecord::Base # Temporary fields to store compare vars # when creating new merge request - attr_accessor :can_be_created, :compare_commits, :compare + attr_accessor :can_be_created, :compare_commits, :diff_options, :compare state_machine :state, initial: :opened do event :close do @@ -196,7 +196,7 @@ class MergeRequest < ActiveRecord::Base end def diff_size - merge_request_diff.size + diffs(diff_options).size end def diff_base_commit |