Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kazuhiko Shiozaki
gitlab-ce
Commits
e59e48d7
Commit
e59e48d7
authored
10 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix-500-admin-transfer' into 'master'
Fix 500 error when transfer project from admin area Fixes #1349
parents
b6435147
f3369e3a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
34 additions
and
6 deletions
+34
-6
app/controllers/admin/projects_controller.rb
app/controllers/admin/projects_controller.rb
+2
-6
features/admin/projects.feature
features/admin/projects.feature
+6
-0
features/steps/admin/projects.rb
features/steps/admin/projects.rb
+26
-0
No files found.
app/controllers/admin/projects_controller.rb
View file @
e59e48d7
...
@@ -23,13 +23,9 @@ class Admin::ProjectsController < Admin::ApplicationController
...
@@ -23,13 +23,9 @@ class Admin::ProjectsController < Admin::ApplicationController
end
end
def
transfer
def
transfer
result
=
::
Projects
::
TransferService
.
new
(
@project
,
current_user
,
project:
params
).
execute
(
:admin
)
::
Projects
::
TransferService
.
new
(
@project
,
current_user
,
params
.
dup
).
execute
if
result
redirect_to
[
:admin
,
@project
.
reload
]
redirect_to
[
:admin
,
@project
]
else
render
:show
end
end
end
protected
protected
...
...
This diff is collapsed.
Click to expand it.
features/admin/projects.feature
View file @
e59e48d7
...
@@ -12,3 +12,9 @@ Feature: Admin Projects
...
@@ -12,3 +12,9 @@ Feature: Admin Projects
When
I visit admin projects page
When
I visit admin projects page
And
I click on first project
And
I click on first project
Then
I should see project details
Then
I should see project details
Scenario
:
Transfer project
Given
group 'Web'
And
I visit admin project page
When
I transfer project to group 'Web'
Then
I should see project transfered
This diff is collapsed.
Click to expand it.
features/steps/admin/projects.rb
View file @
e59e48d7
...
@@ -19,4 +19,30 @@ class AdminProjects < Spinach::FeatureSteps
...
@@ -19,4 +19,30 @@ class AdminProjects < Spinach::FeatureSteps
page
.
should
have_content
(
project
.
name_with_namespace
)
page
.
should
have_content
(
project
.
name_with_namespace
)
page
.
should
have_content
(
project
.
creator
.
name
)
page
.
should
have_content
(
project
.
creator
.
name
)
end
end
step
'I visit admin project page'
do
visit
admin_project_path
(
project
)
end
step
'I transfer project to group \'Web\''
do
find
(
:xpath
,
"//input[@id='namespace_id']"
).
set
group
.
id
click_button
'Transfer'
end
step
'group \'Web\''
do
create
(
:group
,
name:
'Web'
)
end
step
'I should see project transfered'
do
page
.
should
have_content
'Web / '
+
project
.
name
page
.
should
have_content
'Namespace: Web'
end
def
project
@project
||=
Project
.
first
end
def
group
Group
.
find_by
(
name:
'Web'
)
end
end
end
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment