From 49bc7692bf0f9cfc4eaa10d579649764f47d38e6 Mon Sep 17 00:00:00 2001 From: David Celis Date: Thu, 6 Feb 2014 11:15:00 -0800 Subject: [PATCH] Include binstubs generated by Rails 4 Commit b516ecc added `bin/` to the .gitignore file. Now that Discourse runs using Rails 4 by default, however, we should include the binstubs generated by `rake rails:update:bin` in version control as this is the recommendation of the Rails core team. Additionally, for those wishing to deploy Discourse to Heroku, these binstubs are actually mandatory according to [this article](https://devcenter.heroku.com/articles/rails4). Other binstubs can continue to be ignored. Signed-off-by: David Celis --- bin/bundle | 3 +++ bin/rails | 4 ++++ bin/rake | 4 ++++ 3 files changed, 11 insertions(+) create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 00000000000..66e9889e8b4 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100755 index 00000000000..728cd85aa58 --- /dev/null +++ b/bin/rails @@ -0,0 +1,4 @@ +#!/usr/bin/env ruby +APP_PATH = File.expand_path('../../config/application', __FILE__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 00000000000..17240489f64 --- /dev/null +++ b/bin/rake @@ -0,0 +1,4 @@ +#!/usr/bin/env ruby +require_relative '../config/boot' +require 'rake' +Rake.application.run