aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/http_token_authentication_test.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-05-28 01:52:14 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-05-28 01:52:14 -0300
commit7cc9754209c0ae00d70bdd629fa4a81a1c74cc6f (patch)
tree0205c87c305afffd9876c676f23526fe23a6e9c3 /actionpack/test/controller/http_token_authentication_test.rb
parentbe18476fb24ef21a956e79143b6bcde3ec744a64 (diff)
parenta01d164b948371c3405635713d9361f67d10a8bf (diff)
downloadrails-7cc9754209c0ae00d70bdd629fa4a81a1c74cc6f.tar.gz
rails-7cc9754209c0ae00d70bdd629fa4a81a1c74cc6f.tar.bz2
rails-7cc9754209c0ae00d70bdd629fa4a81a1c74cc6f.zip
Merge pull request #20196 from huoxito/preload-association-and-merges
Properly append preload / includes args on Merger
Diffstat (limited to 'actionpack/test/controller/http_token_authentication_test.rb')
0 files changed, 0 insertions, 0 deletions