diff options
| author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-03-07 11:45:14 +0100 |
|---|---|---|
| committer | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-03-13 13:44:31 +0100 |
| commit | 5352ec2e21ba72d77a542b158ce1a98a1a3a9389 (patch) | |
| tree | 831176183236d212819334a79d4c1b79b177c006 | |
| parent | dfb96ed84bd7533abc411b148f0b27bf65321b3e (diff) | |
| download | gitlab-ce-5352ec2e21ba72d77a542b158ce1a98a1a3a9389.tar.gz | |
Fix denting and spec
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | app/controllers/concerns/continue_params.rb | 2 | ||||
| -rw-r--r-- | spec/controllers/projects/imports_controller_spec.rb | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG index 1929b6306db..7c63414e580 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -29,6 +29,7 @@ v 8.6.0 (unreleased) - Add main language of a project in the list of projects (Tiago Botelho) - Add ability to show archived projects on dashboard, explore and group pages - Move group activity to separate page + - Continue parameters are checked to ensure redirection goes to the same instance v 8.5.5 - Ensure removing a project removes associated Todo entries @@ -45,7 +46,6 @@ v 8.5.3 - Show commit message in JIRA mention comment - Makes issue page and merge request page usable on mobile browsers. - Improved UI for profile settings - - Continue parameters are checked to ensure redirection goes to the same instance v 8.5.2 - Fix sidebar overlapping content when screen width was below 1200px diff --git a/app/controllers/concerns/continue_params.rb b/app/controllers/concerns/continue_params.rb index 2ff7250922d..0a995c45bdf 100644 --- a/app/controllers/concerns/continue_params.rb +++ b/app/controllers/concerns/continue_params.rb @@ -5,7 +5,7 @@ module ContinueParams continue_params = params[:continue] return nil unless continue_params - continue_params = continue_params.permit(:to, :notice, :notice_now) + continue_params = continue_params.permit(:to, :notice, :notice_now) return unless continue_params[:to] && continue_params[:to].start_with?('/') continue_params diff --git a/spec/controllers/projects/imports_controller_spec.rb b/spec/controllers/projects/imports_controller_spec.rb index 0147bd2b953..2acbba469e3 100644 --- a/spec/controllers/projects/imports_controller_spec.rb +++ b/spec/controllers/projects/imports_controller_spec.rb @@ -19,7 +19,7 @@ describe Projects::ImportsController do end it 'sets flash.now if params is present' do - get :show, namespace_id: project.namespace.to_param, project_id: project.to_param, continue: { notice_now: 'Started' } + get :show, namespace_id: project.namespace.to_param, project_id: project.to_param, continue: { to: '/', notice_now: 'Started' } expect(flash.now[:notice]).to eq 'Started' end @@ -45,7 +45,7 @@ describe Projects::ImportsController do end it 'sets flash.now if params is present' do - get :show, namespace_id: project.namespace.to_param, project_id: project.to_param, continue: { notice_now: 'In progress' } + get :show, namespace_id: project.namespace.to_param, project_id: project.to_param, continue: { to: '/', notice_now: 'In progress' } expect(flash.now[:notice]).to eq 'In progress' end |