From 5582ae145d3b27b8e1713f966dff62fc3ba2307b Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Mon, 23 Dec 2013 13:24:10 +0200 Subject: [PATCH 1/3] Fix project transfer feature Signed-off-by: Dmitriy Zaporozhets --- app/views/projects/edit.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index c56919e792..44f722d9e1 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -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 From cc51931d1f4a205de412ed8dfca98b832f4c5c91 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Mon, 23 Dec 2013 13:19:13 +0200 Subject: [PATCH 2/3] Fix 500 error when rename repository Signed-off-by: Dmitriy Zaporozhets --- app/contexts/projects/update_context.rb | 2 +- features/project/project.feature | 5 +++++ features/steps/project/project.rb | 15 ++++++++++++--- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/app/contexts/projects/update_context.rb b/app/contexts/projects/update_context.rb index ed0d451a31..94de10de0f 100644 --- a/app/contexts/projects/update_context.rb +++ b/app/contexts/projects/update_context.rb @@ -9,7 +9,7 @@ module Projects 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 diff --git a/features/project/project.feature b/features/project/project.feature index 59eda4a781..d8bb1d55e2 100644 --- a/features/project/project.feature +++ b/features/project/project.feature @@ -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 diff --git a/features/steps/project/project.rb b/features/steps/project/project.rb index a96b086fae..92728d474b 100644 --- a/features/steps/project/project.rb +++ b/features/steps/project/project.rb @@ -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 From 6bc3b5dfa12ef28c2f11ebe003e45b2a051ae2b5 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Mon, 23 Dec 2013 14:21:40 +0200 Subject: [PATCH 3/3] Version to 6.4.1 Signed-off-by: Dmitriy Zaporozhets --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 19b860c187..4c77920fd2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.4.0 +6.4.1