Commit 3801b851 authored by Bob Van Landuyt's avatar Bob Van Landuyt

Resolve conflicts in spec/models/forked_project_link_spec.rb

parent e242ce30
...@@ -6,18 +6,6 @@ describe ForkedProjectLink, "add link on fork" do ...@@ -6,18 +6,6 @@ describe ForkedProjectLink, "add link on fork" do
let(:project_from) { create(:project, :repository) } let(:project_from) { create(:project, :repository) }
let(:project_to) { fork_project(project_from, user) } let(:project_to) { fork_project(project_from, user) }
let(:user) { create(:user) } let(:user) { create(:user) }
<<<<<<< HEAD
def fork_project(from_project, user)
shell = double('gitlab_shell', fork_repository: true)
service = Projects::ForkService.new(from_project, user)
allow(service).to receive(:gitlab_shell).and_return(shell)
service.execute
end
=======
>>>>>>> ce-com/master
before do before do
project_from.add_reporter(user) project_from.add_reporter(user)
......
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