From 0abcb80707b95ed52eeb0943f440c1290bf37d36 Mon Sep 17 00:00:00 2001 From: amurrel Date: Sat, 6 Sep 2014 20:31:09 -0400 Subject: Get Gemfile from master --- Gemfile | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 5a6b98d..c64c0f0 100644 --- a/Gemfile +++ b/Gemfile @@ -13,8 +13,14 @@ gem 'httparty' gem 'simple_captcha2', require: 'simple_captcha' group :development, :test do - # Use sqlite3 as the database for Active Record - gem 'sqlite3' + # Use sqlite3 as the database + gem 'sqlite3', platforms: [ :mri ] + gem 'activerecord-jdbcsqlite3-adapter', platforms: [ :jruby ] +end +group :production do + # USe PostgresQL as the database + gem 'pg', platforms: [ :mri ] + gem 'activerecord-jdbcpostgresql-adapter', platforms: [ :jruby ] end # group :test do @@ -23,9 +29,9 @@ end # gem 'capybara', '2.1.0' # end -# Use SCSS for stylesheets -gem 'sass-rails', '~> 4.0.0' -gem 'bootstrap-sass' +# Use LESS for stylesheets +gem 'less-rails' +gem 'twitter-bootstrap-rails' # Use Uglifier as compressor for JavaScript assets gem 'uglifier', '>= 1.3.0' @@ -34,7 +40,8 @@ gem 'uglifier', '>= 1.3.0' gem 'coffee-rails', '~> 4.0.0' # See https://github.com/sstephenson/execjs#readme for more supported runtimes -gem 'therubyracer', platforms: :ruby +gem 'therubyracer', platforms: [ :mri ] +gem 'therubyrhino', platforms: [ :jruby ] # Use jquery as the JavaScript library gem 'jquery-rails' @@ -59,6 +66,7 @@ group :doc do gem 'sdoc', require: false end +gem "warbler", require: false, platforms: [ :jruby ], groups: [ :development ] # Use ActiveModel has_secure_password # gem 'bcrypt-ruby', '~> 3.1.2' -- cgit v1.2.3