aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal/instrumentation.rb
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2014-08-09 10:43:13 -0300
committerSantiago Pastorino <santiago@wyeworks.com>2014-08-09 10:43:13 -0300
commitff240410622c8911f59b58113c7d7c53caad0450 (patch)
treea6be0e267556aaa1d27d1f04f98a2d274d61694d /actionpack/lib/action_controller/metal/instrumentation.rb
parent9c6c5aa9297883cea779839299b08a2ee4548856 (diff)
parentb7176ab9b5fbceaa257c1161801a28fa21e4f199 (diff)
downloadrails-ff240410622c8911f59b58113c7d7c53caad0450.tar.gz
rails-ff240410622c8911f59b58113c7d7c53caad0450.tar.bz2
rails-ff240410622c8911f59b58113c7d7c53caad0450.zip
Merge pull request #16441 from tomkadwill/activerecord_associations_options_param
[ci skip] Changed options to +options+ for rdoc
Diffstat (limited to 'actionpack/lib/action_controller/metal/instrumentation.rb')
0 files changed, 0 insertions, 0 deletions