2.5-stable: revert r13111 and r13113 (#16685)

git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13120 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/Gemfile b/Gemfile
index b5ce92849b591c905e156a8110589d180558798b..0f8e538fac8aaa25e7fd1e829a4e3c51a07cfb6b 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -6,7 +6,6 @@ gem "jquery-rails", "~> 2.0.2"
 gem "coderay", "~> 1.1.0"
 gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
 gem "builder", "3.0.0"
-gem "request_store"
 gem "mime-types"
 gem "awesome_nested_set", "2.1.6"
 

diff --git a/app/models/user.rb b/app/models/user.rb
index fd245c3e8c83c2a3bfb8235a50d748b08808eadf..4a33590f7048b6bbb1c4cac843e80184d9f88cf5 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -626,11 +626,11 @@ class User < Principal
   end
 
   def self.current=(user)
-    RequestStore.store[:current_user] = user
+    Thread.current[:current_user] = user
   end
 
   def self.current
-    RequestStore.store[:current_user] ||= User.anonymous
+    Thread.current[:current_user] ||= User.anonymous
   end
 
   # Returns the anonymous user.  If the anonymous user does not exist, it is created.  There can be only