diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2013-06-26 22:57:34 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2013-06-26 22:57:34 +0530 |
| commit | 317aaa05883c92165cfb8204634b9fd9b976a97b (patch) | |
| tree | af4186590fb1237499f79f0a0102f4d4dccc7a0c /activesupport | |
| parent | 342de058c44f6ba93c1cfeeedfc4768ea5325a3a (diff) | |
| parent | 73b13f7dc908e419a404add8a331436fe5d67708 (diff) | |
| download | rails-317aaa05883c92165cfb8204634b9fd9b976a97b.tar.gz rails-317aaa05883c92165cfb8204634b9fd9b976a97b.tar.bz2 rails-317aaa05883c92165cfb8204634b9fd9b976a97b.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
guides/source/layout.html.erb
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/class/attribute.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/class/attribute.rb b/activesupport/lib/active_support/core_ext/class/attribute.rb index 6fa9967a28..83038f9da5 100644 --- a/activesupport/lib/active_support/core_ext/class/attribute.rb +++ b/activesupport/lib/active_support/core_ext/class/attribute.rb @@ -70,7 +70,6 @@ class Class # To opt out of both instance methods, pass <tt>instance_accessor: false</tt>. def class_attribute(*attrs) options = attrs.extract_options! - # double assignment is used to avoid "assigned but unused variable" warning instance_reader = options.fetch(:instance_accessor, true) && options.fetch(:instance_reader, true) instance_writer = options.fetch(:instance_accessor, true) && options.fetch(:instance_writer, true) instance_predicate = options.fetch(:instance_predicate, true) |