aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2018-04-13 16:40:46 -0400
committerGitHub <noreply@github.com>2018-04-13 16:40:46 -0400
commit662ba236d115d3e2152b04dcdefdc0ee6f1f6102 (patch)
tree5a829a85ea3edcc47a3772b8cdcd6f1f5c35485a
parent0baf8b9417c99461ee5b7be92e30d191d9575232 (diff)
parent72486005dd906939ced0fd69659b2fae2ee0ee01 (diff)
downloadrails-662ba236d115d3e2152b04dcdefdc0ee6f1f6102.tar.gz
rails-662ba236d115d3e2152b04dcdefdc0ee6f1f6102.tar.bz2
rails-662ba236d115d3e2152b04dcdefdc0ee6f1f6102.zip
Merge pull request #32566 from chrisarcand/fix-broken-nodocs
Fix broken nodocs
-rw-r--r--actionpack/lib/action_dispatch/middleware/flash.rb2
-rw-r--r--activerecord/lib/active_record/associations.rb2
-rw-r--r--activerecord/lib/active_record/attribute_methods/read.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/flash.rb b/actionpack/lib/action_dispatch/middleware/flash.rb
index 3e11846778..fd05eec172 100644
--- a/actionpack/lib/action_dispatch/middleware/flash.rb
+++ b/actionpack/lib/action_dispatch/middleware/flash.rb
@@ -73,7 +73,7 @@ module ActionDispatch
end
end
- def reset_session # :nodoc
+ def reset_session # :nodoc:
super
self.flash = nil
end
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index b1cad0d0a4..0e68e49182 100644
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -241,7 +241,7 @@ module ActiveRecord
association
end
- def association_cached?(name) # :nodoc
+ def association_cached?(name) # :nodoc:
@association_cache.key?(name)
end
diff --git a/activerecord/lib/active_record/attribute_methods/read.rb b/activerecord/lib/active_record/attribute_methods/read.rb
index 14f700b6a9..0f7bcba564 100644
--- a/activerecord/lib/active_record/attribute_methods/read.rb
+++ b/activerecord/lib/active_record/attribute_methods/read.rb
@@ -69,7 +69,7 @@ module ActiveRecord
if defined?(JRUBY_VERSION)
# This form is significantly faster on JRuby, and this is one of our biggest hotspots.
# https://github.com/jruby/jruby/pull/2562
- def _read_attribute(attr_name, &block) # :nodoc
+ def _read_attribute(attr_name, &block) # :nodoc:
@attributes.fetch_value(attr_name.to_s, &block)
end
else