Merge remote-tracking branch 'upstream/master' into hardened-stdenv

This commit is contained in:
Robin Gloster
2016-02-07 11:17:57 +00:00
469 changed files with 23339 additions and 14678 deletions
@@ -147,4 +147,9 @@ rec {
"${patchSet}/patches/ruby/2.2.3/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.2.3/railsexpress/03-display-more-detailed-stack-trace.patch"
];
"2.3.0" = ops useRailsExpress [
"${patchSet}/patches/ruby/2.3.0/railsexpress/01-skip-broken-tests.patch"
"${patchSet}/patches/ruby/2.3.0/railsexpress/02-improve-gc-stats.patch"
"${patchSet}/patches/ruby/2.3.0/railsexpress/03-display-more-detailed-stack-trace.patch"
];
}