Commit 2ccd60da authored by Valery Sizov's avatar Valery Sizov

fixes wrong conflicys resolving

parent 684e9d1b
......@@ -1216,8 +1216,6 @@ class Project < ActiveRecord::Base
import_url_changed? && changes['import_url'].first
end
private
def update_forks_visibility_level
return unless visibility_level < visibility_level_was
......
......@@ -48,11 +48,6 @@ describe Banzai::Filter::MilestoneReferenceFilter, lib: true do
namespace_project_milestone_path(project.namespace, project, milestone)
end
it 'adds to the results hash' do
result = reference_pipeline_result("Milestone #{reference}")
expect(result[:references][:milestone]).to eq [milestone]
end
context 'Integer-based references' do
it 'links to a valid reference' do
doc = reference_filter("See #{reference}")
......@@ -168,11 +163,6 @@ describe Banzai::Filter::MilestoneReferenceFilter, lib: true do
milestone)
end
it 'adds to the results hash' do
result = reference_pipeline_result("Milestone #{reference}")
expect(result[:references][:milestone]).to eq [milestone]
end
it 'contains cross project content' do
expect(result.css('a').first.text).to eq "#{milestone.name} in #{project_path}"
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment