summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOswaldo Ferreira <oswaldo@gitlab.com>2018-01-24 11:46:18 -0200
committerOswaldo Ferreira <oswaldo@gitlab.com>2018-01-24 11:47:37 -0200
commit38ef39550c18124f7a62568900ffff799abf5b97 (patch)
tree20ff128a8b600f74a21417a31ad31372a03e887b
parentc5893d5c83301901522bc354e8b88600c2e083f3 (diff)
downloadgitlab-ce-38ef39550c18124f7a62568900ffff799abf5b97.tar.gz
Remove callback as we already update accordingly on services
-rw-r--r--app/models/merge_request.rb7
-rw-r--r--spec/models/merge_request_spec.rb17
2 files changed, 0 insertions, 24 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 4addf42325d..8028ff3875b 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -56,7 +56,6 @@ class MergeRequest < ActiveRecord::Base
after_create :ensure_merge_request_diff, unless: :importing?
after_update :clear_memoized_shas
after_update :reload_diff_if_branch_changed
- after_update :mark_as_unchecked_if_target_branch_changed
# When this attribute is true some MR validation is ignored
# It allows us to close or modify broken merge requests
@@ -562,12 +561,6 @@ class MergeRequest < ActiveRecord::Base
end
end
- def mark_as_unchecked_if_target_branch_changed
- return unless target_branch_changed?
-
- mark_as_unchecked
- end
-
def reload_diff(current_user = nil)
return unless open?
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 7cc237937f3..c76f32b3989 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -77,23 +77,6 @@ describe MergeRequest do
expect(MergeRequest::Metrics.count).to eq(1)
end
end
-
- describe '#mark_as_unchecked_if_target_branch_changed' do
- let(:merge_request) { create(:merge_request, merge_status: :can_be_merged) }
-
- it 'marks MR as unchecked if target_branch changes' do
- expect { merge_request.update!(target_branch: 'bar') }
- .to change(merge_request, :merge_status)
- .from('can_be_merged')
- .to('unchecked')
- end
-
- it 'does not marks MR as unchecked when target_branch does not changes' do
- expect { merge_request.update!(title: 'foo') }
- .not_to change(merge_request, :merge_status)
- .from('can_be_merged')
- end
- end
end
describe 'respond to' do