Fix denting and spec
This commit is contained in:
parent
dfb96ed84b
commit
5352ec2e21
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue