diff --git a/Gemfile b/Gemfile index bfb220c6..f6171e9d 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,10 @@ source 'https://rubygems.org' # Core gems gem 'rails', '3.2.2' + +# Database adapters gem 'pg' +gem 'sqlite3-ruby', :require => 'sqlite3' # Auth/Bushido gems gem 'devise' @@ -31,12 +34,10 @@ group :assets do gem 'uglifier', '>= 1.0.3' end -# gem 'tane', :path => "/remote/tane", :group => :development - # Test gems, obviously # group :test do # gem 'rspec-rails' # gem 'shoulda-matchers' # gem 'factory_girl_rails' -# gem 'jasmine', :git => "https://github.com/pivotal/jasmine-gem.git", :branch => "1.2.rc1", :group => [:development, :test] +# gem 'jasmine', :git => "https://github.com/pivotal/jasmine-gem.git", :branch => "1.2.rc1", :group => [:development, :test] # end diff --git a/Gemfile.lock b/Gemfile.lock index 2d6c32d4..a467a31e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -154,6 +154,9 @@ GEM hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) + sqlite3 (1.3.5) + sqlite3-ruby (1.3.3) + sqlite3 (>= 1.3.3) thin (1.3.1) daemons (>= 1.0.9) eventmachine (>= 0.12.6) @@ -192,5 +195,6 @@ DEPENDENCIES rails (= 3.2.2) remotipart sass-rails (~> 3.2.3) + sqlite3-ruby thin uglifier (>= 1.0.3)