diff options
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 12 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core_ext/module/attribute_accessors_per_thread.rb | 6 |
3 files changed, 7 insertions, 13 deletions
@@ -16,7 +16,7 @@ gem 'mocha', '~> 0.14', require: false gem 'rack-cache', '~> 1.2' gem 'jquery-rails', github: 'rails/jquery-rails', branch: 'master' gem 'coffee-rails', '~> 4.1.0' -gem 'turbolinks', github: 'rails/turbolinks', branch: 'master' +gem 'turbolinks' gem 'arel', github: 'rails/arel', branch: 'master' gem 'mail', github: 'mikel/mail', branch: 'master' diff --git a/Gemfile.lock b/Gemfile.lock index ab4183f916..0b8ac70d48 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -71,14 +71,6 @@ GIT sprockets (>= 3.0.0) GIT - remote: git://github.com/rails/turbolinks.git - revision: ad583843fdaa0c1f61462a346a495981ca314460 - branch: master - specs: - turbolinks (3.0.0) - coffee-rails - -GIT remote: git://github.com/sass/sass.git revision: bce9509f396225d721501ea1070a6871b708abb1 branch: stable @@ -319,6 +311,8 @@ GEM thread_safe (0.3.5) timers (4.1.1) hitimes + turbolinks (2.5.3) + coffee-rails tzinfo (1.2.2) thread_safe (~> 0.1) tzinfo-data (1.2015.7) @@ -389,7 +383,7 @@ DEPENDENCIES sqlite3 (~> 1.3.6) stackprof sucker_punch - turbolinks! + turbolinks tzinfo-data uglifier (>= 1.3.0) w3c_validators diff --git a/activesupport/lib/active_support/core_ext/module/attribute_accessors_per_thread.rb b/activesupport/lib/active_support/core_ext/module/attribute_accessors_per_thread.rb index eb65a60112..6f9cdf772d 100644 --- a/activesupport/lib/active_support/core_ext/module/attribute_accessors_per_thread.rb +++ b/activesupport/lib/active_support/core_ext/module/attribute_accessors_per_thread.rb @@ -15,7 +15,7 @@ class Module # end # # Current.user # => nil - # Thread.current[:attr_Current_user] = "DHH" + # Thread.thread_variable_set("attr_Current_user", "DHH") # Current.user # => "DHH" # # The attribute name must be a valid method name in Ruby. @@ -63,7 +63,7 @@ class Module # end # # Current.user = "DHH" - # Thread.current[:attr_Current_user] # => "DHH" + # Thread.thread_variable_get("attr_Current_user") # => "DHH" # # If you want to opt out the instance writer method, pass # <tt>instance_writer: false</tt> or <tt>instance_accessor: false</tt>. @@ -111,7 +111,7 @@ class Module # class Customer < Account # end # - # Customer.user = "DHH" + # Customer.user = "Rafael" # Account.user # => "DHH" # # To opt out of the instance writer method, pass <tt>instance_writer: false</tt>. |