Commit d663e895 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch '6-4-stable' of dev.gitlab.org:gitlab/gitlabhq into 6-4-from-ce

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
parents 581f4663 6bc3b5df
...@@ -9,7 +9,7 @@ module Projects ...@@ -9,7 +9,7 @@ module Projects
new_branch = params[:project].delete(:default_branch) new_branch = params[:project].delete(:default_branch)
if project.repository.exists? && new_branch != project.default_branch if project.repository.exists? && new_branch && new_branch != project.default_branch
project.change_head(new_branch) project.change_head(new_branch)
end end
......
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
.title Transfer project .title Transfer project
.errors-holder .errors-holder
.form-holder .form-holder
= form_for(@project, url: transfer_project_path(@project), remote: true, html: { class: 'transfer-project' }) do |f| = form_for(@project, url: transfer_project_path(@project), method: :put, remote: true, html: { class: 'transfer-project' }) do |f|
.control-group .control-group
= f.label :namespace_id do = f.label :namespace_id do
%span Namespace %span Namespace
......
...@@ -19,3 +19,8 @@ Feature: Project Feature ...@@ -19,3 +19,8 @@ Feature: Project Feature
And change project settings And change project settings
And I save project And I save project
Then I should see project with new settings Then I should see project with new settings
Scenario: I change project path
When I visit edit project "Shop" page
And change project path settings
Then I should see project with new path settings
...@@ -3,16 +3,25 @@ class ProjectFeature < Spinach::FeatureSteps ...@@ -3,16 +3,25 @@ class ProjectFeature < Spinach::FeatureSteps
include SharedProject include SharedProject
include SharedPaths include SharedPaths
And 'change project settings' do step 'change project settings' do
fill_in 'project_name', with: 'NewName' fill_in 'project_name', with: 'NewName'
uncheck 'project_issues_enabled' uncheck 'project_issues_enabled'
end end
And 'I save project' do step 'I save project' do
click_button 'Save changes' click_button 'Save changes'
end end
Then 'I should see project with new settings' do step 'I should see project with new settings' do
find_field('project_name').value.should == 'NewName' find_field('project_name').value.should == 'NewName'
end end
step 'change project path settings' do
fill_in "project_path", with: "new-path"
click_button "Rename"
end
step 'I should see project with new path settings' do
project.path.should == "new-path"
end
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