aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorSean Griffin <sean@seantheprogrammer.com>2015-10-20 14:54:22 -0600
committerSean Griffin <sean@seantheprogrammer.com>2015-10-20 14:54:22 -0600
commit3e29d96ecda48a287601ec09321f7444df8266be (patch)
tree7eca9b23ea11ebb273140c8a66ccce9e44f6bd43 /actionpack
parent03aacc55a239345a3ca8b36d188a338e7dab5189 (diff)
downloadrails-3e29d96ecda48a287601ec09321f7444df8266be.tar.gz
rails-3e29d96ecda48a287601ec09321f7444df8266be.tar.bz2
rails-3e29d96ecda48a287601ec09321f7444df8266be.zip
Fix test failures caused by d99db6b8b3e4
I messed up the merge conflict, and accidentally removed a schema query that needed to be ignored.
Diffstat (limited to 'actionpack')
0 files changed, 0 insertions, 0 deletions