summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2019-04-11 15:24:13 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2019-04-12 16:42:32 +0300
commitda026ac2eca6126bf176ace5d70426db41239a58 (patch)
treed98a5f0356272690239f5493aa74dc313d6f9bc2 /app/controllers
parentca8c35285eedb0ae6e9a52fe377ec0b3ae9ada1a (diff)
downloadgitlab-ce-da026ac2eca6126bf176ace5d70426db41239a58.tar.gz
Remove rails-deprecated_sanitizer dependency17014-remove-rails-deprecated_sanitizer
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/projects/branches_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb
index 9c31ae6376a..e14abbf7c78 100644
--- a/app/controllers/projects/branches_controller.rb
+++ b/app/controllers/projects/branches_controller.rb
@@ -53,7 +53,7 @@ class Projects::BranchesController < Projects::ApplicationController
# rubocop: disable CodeReuse/ActiveRecord
def create
- branch_name = sanitize(strip_tags(params[:branch_name]))
+ branch_name = strip_tags(sanitize(params[:branch_name]))
branch_name = Addressable::URI.unescape(branch_name)
redirect_to_autodeploy = project.empty_repo? && project.deployment_platform.present?
@@ -122,7 +122,7 @@ class Projects::BranchesController < Projects::ApplicationController
def ref
if params[:ref]
- ref_escaped = sanitize(strip_tags(params[:ref]))
+ ref_escaped = strip_tags(sanitize(params[:ref]))
Addressable::URI.unescape(ref_escaped)
else
@project.default_branch || 'master'