From b2c30d0e3458201f7bc269a4f29060f4ecb7327b Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Thu, 16 Apr 2015 16:15:04 +1000
Subject: [PATCH] Revert "travis likes old bundler"

This reverts commit 1adda31cbc6ae26d94191bf11d8165297b8d24c0.
---
 Gemfile   |  2 --
 bin/rails | 18 +++---------------
 bin/rake  | 18 +++---------------
 3 files changed, 6 insertions(+), 32 deletions(-)

diff --git a/Gemfile b/Gemfile
index 50a64cb1392..14b81a28c78 100644
--- a/Gemfile
+++ b/Gemfile
@@ -250,8 +250,6 @@ begin
   gem 'memory_profiler', require: false, platform: [:mri_21, :mri_22]
 rescue Bundler::GemfileError
   STDERR.puts "You are running an old version of bundler, please upgrade bundler ASAP, if you are using Discourse docker, rebuild your container."
-  gem 'stackprof', require: false, platform: [:mri_21]
-  gem 'memory_profiler', require: false, platform: [:mri_21]
 end
 
 gem 'rmmseg-cpp', require: false
diff --git a/bin/rails b/bin/rails
index 657440d20a7..728cd85aa58 100755
--- a/bin/rails
+++ b/bin/rails
@@ -1,16 +1,4 @@
 #!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'rails' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('railties', 'rails')
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'
diff --git a/bin/rake b/bin/rake
index 26c7a2d5b5f..17240489f64 100755
--- a/bin/rake
+++ b/bin/rake
@@ -1,16 +1,4 @@
 #!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'rake' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('rake', 'rake')
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run