From 8a39af24a1e7383b772095cf57beab2462c8de9f Mon Sep 17 00:00:00 2001 From: Paul Scarrone Date: Mon, 17 Feb 2014 19:57:36 -0500 Subject: [PATCH 1/2] Adding default bin directory back to application These are required to allow application to be served from the command line --- 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 0000000..66e9889 --- /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 0000000..728cd85 --- /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 0000000..1724048 --- /dev/null +++ b/bin/rake @@ -0,0 +1,4 @@ +#!/usr/bin/env ruby +require_relative '../config/boot' +require 'rake' +Rake.application.run From 60b8c153efd599f841aeb14f6a4adc349f5a9c63 Mon Sep 17 00:00:00 2001 From: Paul Scarrone Date: Mon, 17 Feb 2014 19:57:58 -0500 Subject: [PATCH 2/2] Adjusted gems that no longer have valid branches --- Gemfile | 2 +- Gemfile.lock | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index 21c588b..3df76c3 100644 --- a/Gemfile +++ b/Gemfile @@ -43,7 +43,7 @@ gem 'debugger', group: [:development, :test] # Project specific gem 'sass-rails', '~> 4.0.0' -gem 'bootstrap-sass', :github => 'thomas-mcdonald/bootstrap-sass', branch: '3' +gem 'bootstrap-sass', '~> 3.1.1.0' gem 'haml' gem 'best_in_place', :github => 'bernat/best_in_place', branch: 'rails-4' gem 'kaminari' diff --git a/Gemfile.lock b/Gemfile.lock index ecf5c2c..8d201bd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,14 +7,6 @@ GIT jquery-rails rails (~> 4) -GIT - remote: git://github.com/thomas-mcdonald/bootstrap-sass.git - revision: 0e88056ac5d58fb0bbd23d3fe929eac01712d964 - branch: 3 - specs: - bootstrap-sass (3.0.0.0) - sass (~> 3.2) - GEM remote: https://rubygems.org/ specs: @@ -44,6 +36,8 @@ GEM tzinfo (~> 0.3.37) arel (4.0.0) atomic (1.1.14) + bootstrap-sass (3.1.1.0) + sass (~> 3.2) builder (3.1.4) coffee-rails (4.0.0) coffee-script (>= 2.2.0) @@ -138,7 +132,7 @@ PLATFORMS DEPENDENCIES best_in_place! - bootstrap-sass! + bootstrap-sass (~> 3.1.1.0) coffee-rails (~> 4.0.0) debugger haml