diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-22 06:12:00 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-22 06:12:00 +0000 |
commit | 4f47eaf9ae4c54d3c5aefa3cdf537d5bf739b533 (patch) | |
tree | 3255bc5d866a440589d2fc9cef9ac88017b40c25 | |
parent | c5678d4ecb9e557c9e70ddddbef493470d2fc229 (diff) | |
parent | af2a6ec1507e4145f14b0cbaccc7f75447c168cc (diff) | |
download | gitlab-ce-4f47eaf9ae4c54d3c5aefa3cdf537d5bf739b533.tar.gz |
Merge branch 'fix-default-branch' into 'master'
Fix project default branch change
It is a regression since 7.0. It was caused with switch to `strong_params`.
This MR is safe to merge and it fixes issue https://gitlab.com/gitlab-org/gitlab-ce/issues/433
See merge request !984
-rw-r--r-- | app/controllers/projects_controller.rb | 2 | ||||
-rw-r--r-- | features/project/project.feature | 6 | ||||
-rw-r--r-- | features/steps/project/project.rb | 11 |
3 files changed, 18 insertions, 1 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 597efa40ded..3d012b7e164 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -189,7 +189,7 @@ class ProjectsController < ApplicationController def project_params params.require(:project).permit( :name, :path, :description, :issues_tracker, :label_list, - :issues_enabled, :merge_requests_enabled, :snippets_enabled, :issues_tracker_id, + :issues_enabled, :merge_requests_enabled, :snippets_enabled, :issues_tracker_id, :default_branch, :wiki_enabled, :visibility_level, :import_url, :last_activity_at, :namespace_id ) end diff --git a/features/project/project.feature b/features/project/project.feature index d561c6e440e..c1f192f123e 100644 --- a/features/project/project.feature +++ b/features/project/project.feature @@ -29,3 +29,9 @@ Feature: Project Feature When I visit project "Shop" page Then I should see project "Shop" README link And I should see project "Shop" version + + Scenario: I should change project default branch + When I visit edit project "Shop" page + And change project default branch + And I save project + Then I should see project default branch changed diff --git a/features/steps/project/project.rb b/features/steps/project/project.rb index 7c0b2509416..b6968152aaf 100644 --- a/features/steps/project/project.rb +++ b/features/steps/project/project.rb @@ -36,4 +36,15 @@ class ProjectFeature < Spinach::FeatureSteps page.should have_content "Version: 2.2.0" end end + + step 'change project default branch' do + select 'stable', from: 'project_default_branch' + end + + step 'I should see project default branch changed' do + # TODO: Uncomment this when we can do real gitlab-shell calls + # from spinach tests. Right now gitlab-shell calls are stubbed so this test + # will not pass + # find(:css, 'select#project_default_branch').value.should == 'stable' + end end |