diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-05 00:09:24 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-05 00:09:24 +0000 |
| commit | 7ff2de7c12d71873a3c0e85cc6fbcd5d5f05b5c1 (patch) | |
| tree | f6b2dc4c2c294d21c99aba8011566d856648d84d /config | |
| parent | 6609e5ea75a9e119651e19574c30c11ce19c62d0 (diff) | |
| download | gitlab-ce-7ff2de7c12d71873a3c0e85cc6fbcd5d5f05b5c1.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_flags/development/environment_tier.yml | 8 | ||||
| -rw-r--r-- | config/initializers/warden.rb | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/config/feature_flags/development/environment_tier.yml b/config/feature_flags/development/environment_tier.yml new file mode 100644 index 00000000000..0459d1f212d --- /dev/null +++ b/config/feature_flags/development/environment_tier.yml @@ -0,0 +1,8 @@ +--- +name: environment_tier +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55471 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/323166 +milestone: '13.10' +type: development +group: group::release +default_enabled: false diff --git a/config/initializers/warden.rb b/config/initializers/warden.rb index 2517c0cf5c2..88f2a13df60 100644 --- a/config/initializers/warden.rb +++ b/config/initializers/warden.rb @@ -42,8 +42,7 @@ Rails.application.configure do |config| activity = Gitlab::Auth::Activity.new(opts) tracker = Gitlab::Auth::BlockedUserTracker.new(user, auth) - # TODO: switch to `auth.request.session.id.private_id` in 13.7 - ActiveSession.destroy_with_rack_session_id(user, auth.request.session.id) + ActiveSession.destroy_session(user, auth.request.session.id.private_id) if auth.request.session.id activity.user_session_destroyed! ## |