diff options
| author | karen Carias <karen@gitlab.com> | 2015-07-16 11:25:12 -0700 |
|---|---|---|
| committer | karen Carias <karen@gitlab.com> | 2015-07-16 11:25:12 -0700 |
| commit | 70a08acedf96b685fea93f759637439884a66aa7 (patch) | |
| tree | 49041f01ed1f0ee4098ac9105d84f5cdbf8baedb /lib/api/groups.rb | |
| parent | 53d40b8ab1275fa39e1ae4b82a228ccf731045f9 (diff) | |
| parent | 9b6f1c59484a0c0e4cee9a27cfa4dc9a89683848 (diff) | |
| download | gitlab-ce-70a08acedf96b685fea93f759637439884a66aa7.tar.gz | |
fixed conflict
Diffstat (limited to 'lib/api/groups.rb')
| -rw-r--r-- | lib/api/groups.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/groups.rb b/lib/api/groups.rb index e88b6e31775..024aeec2e14 100644 --- a/lib/api/groups.rb +++ b/lib/api/groups.rb @@ -74,9 +74,9 @@ module API # POST /groups/:id/projects/:project_id post ":id/projects/:project_id" do authenticated_as_admin! - group = Group.find(params[:id]) + group = Group.find_by(id: params[:id]) project = Project.find(params[:project_id]) - result = ::Projects::TransferService.new(project, current_user, namespace_id: group.id).execute + result = ::Projects::TransferService.new(project, current_user).execute(group) if result present group |