Commit graph

16 commits

Author SHA1 Message Date
Sam
9defb6879b upgrade to rails master 2014-12-01 15:34:50 +11:00
Sam
12e587c9b3 update rails master 2014-11-26 17:26:27 +11:00
Sam
a211f542f5 update rails 2014-11-19 15:31:12 +11:00
Sam
0faab6d54a update rails master 2014-11-18 10:12:36 +11:00
Sam
35d6f29ad3 update rails master 2014-11-17 11:18:48 +11:00
Sam
6ca87d281d update rails 2014-11-14 14:42:44 +11:00
Sam
6f231822d5 update rails master 2014-11-13 08:56:05 +11:00
Sam
ab481bb7a9 pull in latest arel 2014-11-13 08:51:06 +11:00
Sam
adcf8b4b18 update flamegraph for superior flamegraphs
(add github links and easier ability to share issues)
2014-11-12 15:46:07 +11:00
Sam
3b9df39687 update rails master 2014-11-12 11:46:52 +11:00
Sam
23ad68678e rails master fixes 2014-11-11 12:58:56 +11:00
Sam
4e1c5177db update rails master 2014-11-11 10:32:47 +11:00
Godfrey Chan
b4679075de Upgrade to the latest AMS 0.8.x (unreleased)
The current released version (0.8.2) does not work with Rails master at all. In
fact, it was quite surprising to me that this is the only test that broke...

See https://github.com/rails-api/active_model_serializers/pull/655
2014-11-10 01:05:47 -08:00
Godfrey Chan
84d4307b1c actionpack-action_caching was released a long time ago 2014-11-10 01:05:46 -08:00
Godfrey Chan
903b505394 Rebuild Gemfile_master.lock based on the lastest Gemfile.lock 2014-11-10 01:05:46 -08:00
Sam
5aae2e937a minor hacking to get rails master to work
(note broken cause type mapping changed but close to working)

commented gemfile a bit
2014-09-04 17:11:42 +10:00