diff options
| author | Heinrich Lee Yu <heinrich@gitlab.com> | 2019-06-26 01:54:42 +0800 |
|---|---|---|
| committer | Heinrich Lee Yu <heinrich@gitlab.com> | 2019-07-12 10:15:31 +0800 |
| commit | aeb67dd489b1ccc7f0ab1d702725729ab9cc3e27 (patch) | |
| tree | c508ba9459274be6a8a0488a838d31f03f45faba /app/controllers | |
| parent | ecffca5d92353d55aaf8f984737fa617782310e0 (diff) | |
| download | gitlab-ce-aeb67dd489b1ccc7f0ab1d702725729ab9cc3e27.tar.gz | |
Upgrade to Rails 5.2upgrade-rails-5-2-ce
Updates changed method names and fixes spec failures
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/concerns/requires_whitelisted_monitoring_client.rb | 2 | ||||
| -rw-r--r-- | app/controllers/groups_controller.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/concerns/requires_whitelisted_monitoring_client.rb b/app/controllers/concerns/requires_whitelisted_monitoring_client.rb index f47ead2f0da..2e9905997db 100644 --- a/app/controllers/concerns/requires_whitelisted_monitoring_client.rb +++ b/app/controllers/concerns/requires_whitelisted_monitoring_client.rb @@ -28,7 +28,7 @@ module RequiresWhitelistedMonitoringClient def valid_token? token = params[:token].presence || request.headers['TOKEN'] token.present? && - ActiveSupport::SecurityUtils.variable_size_secure_compare( + ActiveSupport::SecurityUtils.secure_compare( token, Gitlab::CurrentSettings.health_check_access_token ) diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 797833e3f91..dbddee47997 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -107,7 +107,7 @@ class GroupsController < Groups::ApplicationController if Groups::UpdateService.new(@group, current_user, group_params).execute redirect_to edit_group_path(@group, anchor: params[:update_section]), notice: "Group '#{@group.name}' was successfully updated." else - @group.restore_path! + @group.path = @group.path_before_last_save || @group.path_was render action: "edit" end |