Commit 44b1eadf authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

......@@ -73,6 +73,10 @@
font-weight: bold;
}
a {
display: block;
}
.project-name, .group-name {
font-size: 15px;
}
......
......@@ -9,7 +9,7 @@ def execute(role = :default)
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)
end
......
......@@ -130,7 +130,7 @@
.title Transfer project
.errors-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
= f.label :namespace_id do
%span Namespace
......
......@@ -19,3 +19,8 @@ Feature: Project Feature
And change project settings
And I save project
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
include SharedProject
include SharedPaths
And 'change project settings' do
step 'change project settings' do
fill_in 'project_name', with: 'NewName'
uncheck 'project_issues_enabled'
end
And 'I save project' do
step 'I save project' do
click_button 'Save changes'
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'
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
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