Automatic merge of gitlab-org/gitlab-ce master

changelogs/unreleased/sh-revert-redis-cache-store.yml

+---
+title: Fix "ERR value is not an integer or out of range" errors
+merge_request: 32126
+author:
+type: fixed

config/application.rb

@@ -241,10 +241,7 @@ module Gitlab
     end
 
     # Use caching across all environments
-    # Full list of options:
-    # https://api.rubyonrails.org/classes/ActiveSupport/Cache/RedisCacheStore.html#method-c-new
     caching_config_hash = Gitlab::Redis::Cache.params
-    caching_config_hash[:compress] = false
     caching_config_hash[:namespace] = Gitlab::Redis::Cache::CACHE_NAMESPACE
     caching_config_hash[:expires_in] = 2.weeks # Cache should not grow forever
     if Sidekiq.server? # threaded context
@@ -252,7 +249,7 @@ module Gitlab
       caching_config_hash[:pool_timeout] = 1
     end
 
-    config.cache_store = :redis_cache_store, caching_config_hash
+    config.cache_store = :redis_store, caching_config_hash
 
     config.active_job.queue_adapter = :sidekiq
 

qa/README.md

@@ -39,6 +39,11 @@ have an instance available you can follow the instructions below to use
 the [GitLab Development Kit (GDK)][GDK].
 This is the recommended option if you would like to contribute to the tests.
 
+Note: GitLab QA uses [Selenium WebDriver](https://www.seleniumhq.org/) via
+[Cabybara](http://teamcapybara.github.io/capybara/), and by default it targets Chrome as
+the browser to use. You will need to have Chrome (or Chromium) and
+[chromedriver](https://chromedriver.chromium.org/) installed / in your `$PATH`.
+
 ### Run the end-to-end tests in a local development environment
 
 Follow the GDK instructions to [prepare](https://gitlab.com/gitlab-org/gitlab-development-kit/blob/master/doc/prepare.md)