aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/models/bird.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-12-04 18:24:23 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-12-04 18:24:23 -0200
commit191ea4b85b6878feedc1b18d0dcf56d2825895a1 (patch)
tree8359c11302e26c60f805a47f97ad00653ebe6ba3 /activerecord/test/models/bird.rb
parent2673a359e1020390cc8ae0208e7795f61c9fba89 (diff)
parent2fa4cbeebde4cbaf4fdddb1723960710c67f89a8 (diff)
downloadrails-191ea4b85b6878feedc1b18d0dcf56d2825895a1.tar.gz
rails-191ea4b85b6878feedc1b18d0dcf56d2825895a1.tar.bz2
rails-191ea4b85b6878feedc1b18d0dcf56d2825895a1.zip
Merge pull request #17825 from aripollak/fix-activejob-sidekiq-integration
Fix Sidekiq ActiveJob integration setup Conflicts: activejob/test/support/integration/adapters/sidekiq.rb
Diffstat (limited to 'activerecord/test/models/bird.rb')
0 files changed, 0 insertions, 0 deletions