Merge commit 'mainstream/master'

1 files changed, 0 insertions, 40 deletions

diff --git a/railties/lib/vendor/bundler/bin/gem_bundler b/railties/lib/vendor/bundler/bin/gem_bundler
deleted file mode 100755
index 7a8771efee..0000000000
--- a/railties/lib/vendor/bundler/bin/gem_bundler
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env ruby
-require "optparse"
-require "bundler"
-
-options = {}
-
-parser = OptionParser.new do |op|
-  op.banner = "Usage: gem_bundler [OPTIONS] [PATH]"
-
-  op.on("-m", "--manifest MANIFEST") do |manifest|
-    options[:manifest] = manifest
-  end
-
-  op.on_tail("-h", "--help", "Show this message") do
-    puts op
-    exit
-  end
-end
-parser.parse!
-
-options[:path] = ARGV.shift
-
-unless options[:path]
-  puts parser
-  puts %(
-    [PATH] must be specified
-  )
-  exit
-end
-
-unless options[:manifest] && File.exist?(options[:manifest])
-  puts parser
-  puts %(
-    MANIFEST must be a valid manifest file
-  )
-  exit
-end
-
-
-Bundler.run(options)
\ No newline at end of file