Skip to content
Snippets Groups Projects
Commit bb0543ef authored by micael.bergeron's avatar micael.bergeron
Browse files

ignore the column before the migration

reword the changelog
remove dead code in the specs
parent 6c1c64d4
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -8,7 +8,8 @@ class MergeRequest < ActiveRecord::Base
include CreatedAtFilterable
include TimeTrackable
 
ignore_column :locked_at
ignore_column :locked_at,
:ref_fetched
 
belongs_to :target_project, class_name: "Project"
belongs_to :source_project, class_name: "Project"
Loading
Loading
---
title: Removed merge requests fetching their refs on every action.
title: Stop merge requests from fetching their refs when the data is already available.
merge_request: 15129
author:
type: removed
Loading
Loading
@@ -83,10 +83,10 @@ FactoryGirl.define do
target_project = merge_request.target_project
source_project = merge_request.source_project
 
# Fake `write_ref` if we don't have repository
# Fake `fetch_ref!` if we don't have repository
# We have too many existing tests replying on this behaviour
unless [target_project, source_project].all?(&:repository_exists?)
allow(merge_request).to receive(:write_ref)
allow(merge_request).to receive(:fetch_ref!)
end
end
 
Loading
Loading
Loading
Loading
@@ -623,8 +623,6 @@ describe API::MergeRequests do
 
before do
forked_project.add_reporter(user2)
allow_any_instance_of(MergeRequest).to receive(:write_ref)
end
 
it "returns merge_request" do
Loading
Loading
Loading
Loading
@@ -319,8 +319,6 @@ describe API::MergeRequests do
 
before do
forked_project.add_reporter(user2)
allow_any_instance_of(MergeRequest).to receive(:write_ref)
end
 
it "returns merge_request" do
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment