Commit dfb96ed8 authored by Zeger-Jan van de Weg's avatar Zeger-Jan van de Weg

ContinueToParams -> ContinueParams

parent 1cefb73a
...@@ -45,6 +45,7 @@ v 8.5.3 ...@@ -45,6 +45,7 @@ v 8.5.3
- Show commit message in JIRA mention comment - Show commit message in JIRA mention comment
- Makes issue page and merge request page usable on mobile browsers. - Makes issue page and merge request page usable on mobile browsers.
- Improved UI for profile settings - Improved UI for profile settings
- Continue parameters are checked to ensure redirection goes to the same instance
v 8.5.2 v 8.5.2
- Fix sidebar overlapping content when screen width was below 1200px - Fix sidebar overlapping content when screen width was below 1200px
......
module ContinueToParams module ContinueParams
extend ActiveSupport::Concern extend ActiveSupport::Concern
def continue_params def continue_params
...@@ -6,7 +6,7 @@ module ContinueToParams ...@@ -6,7 +6,7 @@ module ContinueToParams
return nil unless continue_params return nil unless continue_params
continue_params = continue_params.permit(:to, :notice, :notice_now) continue_params = continue_params.permit(:to, :notice, :notice_now)
continue_params[:to] = root_url unless continue_params[:to].start_with?('/') return unless continue_params[:to] && continue_params[:to].start_with?('/')
continue_params continue_params
end end
......
class Projects::ForksController < Projects::ApplicationController class Projects::ForksController < Projects::ApplicationController
include ContinueToParams include ContinueParams
# Authorize # Authorize
before_action :require_non_empty_project before_action :require_non_empty_project
......
class Projects::ImportsController < Projects::ApplicationController class Projects::ImportsController < Projects::ApplicationController
include ContinueToParams include ContinueParams
# Authorize # Authorize
before_action :authorize_admin_project! before_action :authorize_admin_project!
......
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