Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 0 deletions

diff --git a/config/application.rb b/config/application.rb
index da674b2b944..f9cc1cb543a 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -261,6 +261,10 @@ module Gitlab
       caching_config_hash[:pool_timeout] = 1
     end
 
+    # Overrides RedisCacheStore's default value of 0
+    # This makes the default value the same with Gitlab::Redis::Cache
+    caching_config_hash[:reconnect_attempts] ||= ::Redis::Client::DEFAULTS[:reconnect_attempts]
+
     config.cache_store = :redis_cache_store, caching_config_hash
 
     config.active_job.queue_adapter = :sidekiq
diff --git a/config/routes/project.rb b/config/routes/project.rb
index be207f155f9..b420f07c7a1 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -275,6 +275,9 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
             get ':issue_id/stack_trace',
               to: 'error_tracking/stack_traces#index',
               as: 'stack_trace'
+            put ':issue_id',
+              to: 'error_tracking#update',
+              as: 'update'
           end
         end