From 45623089e2325494cf79c5b832eeb08d5598b2fe Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 15 Jul 2014 15:34:06 +0300 Subject: Refactor MR build process Signed-off-by: Dmitriy Zaporozhets --- app/models/merge_request.rb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'app/models/merge_request.rb') diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 597e02d498b..530e1add8e7 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -42,6 +42,10 @@ class MergeRequest < ActiveRecord::Base # It allows us to close or modify broken merge requests attr_accessor :allow_broken + # Temporary fields to store compare vars + # when creating new merge request + attr_accessor :can_be_created, :compare_failed, :compare_base_commit, :compare_commits, :compare_diffs + ActsAsTaggableOn.strict_case_match = true acts_as_taggable_on :labels -- cgit v1.2.1 From be5b6db883ee634dc53e0a50ac57f424507d7a7d Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 15 Jul 2014 18:28:21 +0300 Subject: Refactor diff suppress logic and diff views Signed-off-by: Dmitriy Zaporozhets --- app/models/merge_request.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/models/merge_request.rb') diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 530e1add8e7..28486fb41c6 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -44,7 +44,8 @@ class MergeRequest < ActiveRecord::Base # Temporary fields to store compare vars # when creating new merge request - attr_accessor :can_be_created, :compare_failed, :compare_base_commit, :compare_commits, :compare_diffs + attr_accessor :can_be_created, :compare_failed, :compare_base_commit, + :compare_commits, :compare_diffs ActsAsTaggableOn.strict_case_match = true acts_as_taggable_on :labels -- cgit v1.2.1