diff options
author | Thong Kuah <tkuah@gitlab.com> | 2019-08-12 22:55:11 +0000 |
---|---|---|
committer | Thong Kuah <tkuah@gitlab.com> | 2019-08-12 22:55:11 +0000 |
commit | 2de17d12d6d8daf1296526ca0b594cf61f808339 (patch) | |
tree | a0cb5f5712ca5c6d070e4ac238feff864da8b6b0 /config | |
parent | 4254f5dc0ea4c226690d0d9abd20d1c9822fefcb (diff) | |
parent | d470f429fb84fc02a7105de99225a93c5345b3f2 (diff) | |
download | gitlab-ce-2de17d12d6d8daf1296526ca0b594cf61f808339.tar.gz |
Merge branch '63942-remove-config-action_dispatch-use_authenticated_cookie_encryption-configuration' into 'master'
Remove `config.action_dispatch.use_authenticated_cookie_encryption` configuration
Closes #63942
See merge request gitlab-org/gitlab-ce!31463
Diffstat (limited to 'config')
-rw-r--r-- | config/application.rb | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/config/application.rb b/config/application.rb index 47c5ab71285..733f8652286 100644 --- a/config/application.rb +++ b/config/application.rb @@ -293,10 +293,5 @@ module Gitlab Gitlab::Routing.add_helpers(project_url_helpers) Gitlab::Routing.add_helpers(MilestonesRoutingHelper) end - - # This makes generated cookies to be compatible with Rails 5.1 and older - # We can remove this when we're confident that there are no issues with the Rails 5.2 upgrade - # and we won't need to rollback to older versions - config.action_dispatch.use_authenticated_cookie_encryption = false end end |