Commit b72feadc authored by Rémy Coutable's avatar Rémy Coutable

Fix another wrong conflict resolution

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 7ac86084
...@@ -90,7 +90,7 @@ class @LabelsSelect ...@@ -90,7 +90,7 @@ class @LabelsSelect
saveLabel = -> saveLabel = ->
# Create new label with API # Create new label with API
Api.newLabel namespacePath, projectPath, { Api.newLabel namespacePath, projectPath, {
name: newLabelField.val() title: newLabelField.val()
color: newColorField.val() color: newColorField.val()
}, (label) -> }, (label) ->
$newLabelCreateButton.enable() $newLabelCreateButton.enable()
......
...@@ -12,14 +12,14 @@ describe Projects::ForkService, services: true do ...@@ -12,14 +12,14 @@ describe Projects::ForkService, services: true do
description: 'wow such project') description: 'wow such project')
@to_namespace = create(:namespace) @to_namespace = create(:namespace)
@to_user = create(:user, namespace: @to_namespace) @to_user = create(:user, namespace: @to_namespace)
@from_project.add_user(@to_user, :developer) @from_project.team.add_user(@to_user, :developer)
end end
context 'fork project' do context 'fork project' do
context 'when forker is a guest' do context 'when forker is a guest' do
before do before do
@guest = create(:user) @guest = create(:user)
@from_project.add_user(@guest, :guest) @from_project.team.add_user(@guest, :guest)
end end
subject { fork_project(@from_project, @guest) } subject { fork_project(@from_project, @guest) }
...@@ -97,8 +97,8 @@ describe Projects::ForkService, services: true do ...@@ -97,8 +97,8 @@ describe Projects::ForkService, services: true do
@group = create(:group) @group = create(:group)
@group.add_user(@group_owner, GroupMember::OWNER) @group.add_user(@group_owner, GroupMember::OWNER)
@group.add_user(@developer, GroupMember::DEVELOPER) @group.add_user(@developer, GroupMember::DEVELOPER)
@project.add_user(@developer, :developer) @project.team.add_user(@developer, :developer)
@project.add_user(@group_owner, :developer) @project.team.add_user(@group_owner, :developer)
@opts = { namespace: @group } @opts = { namespace: @group }
end 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