##// END OF EJS Templates
2.4-stable: revert r13114 (#16685)...
Toshi MARUYAMA -
r12846:87cb2fdfd19e
parent child
Show More
@@ -6,7 +6,6 gem "jquery-rails", "~> 2.0.2"
6 gem "coderay", "~> 1.1.0"
6 gem "coderay", "~> 1.1.0"
7 gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
7 gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
8 gem "builder", "3.0.0"
8 gem "builder", "3.0.0"
9 gem "request_store"
10
9
11 # Optional gem for LDAP authentication
10 # Optional gem for LDAP authentication
12 group :ldap do
11 group :ldap do
@@ -607,11 +607,11 class User < Principal
607 end
607 end
608
608
609 def self.current=(user)
609 def self.current=(user)
610 RequestStore.store[:current_user] = user
610 Thread.current[:current_user] = user
611 end
611 end
612
612
613 def self.current
613 def self.current
614 RequestStore.store[:current_user] ||= User.anonymous
614 Thread.current[:current_user] ||= User.anonymous
615 end
615 end
616
616
617 # Returns the anonymous user. If the anonymous user does not exist, it is created. There can be only
617 # Returns the anonymous user. If the anonymous user does not exist, it is created. There can be only
General Comments 0
You need to be logged in to leave comments. Login now