diff --git a/.gitignore b/.gitignore index 1d83d11..d5416be 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +Gemfile.lock .bundle db/*.sqlite3 log/*.log diff --git a/Gemfile b/Gemfile index 6eaf0e0..d47c53f 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,8 @@ source 'http://rubygems.org' gem 'rails', '3.1.1' gem 'jquery-rails' -gem 'mysql2' +#gem 'mysql2' +gem 'sqlite3' gem 'rack', '1.3.3' gem 'thin' diff --git a/Gemfile.lock b/Gemfile.lock index ae3d593..1d4b1c8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -66,7 +66,6 @@ GEM treetop (~> 1.4.8) mime-types (1.17.2) multi_json (1.0.3) - mysql2 (0.3.7) polyglot (0.3.3) rack (1.3.3) rack-cache (1.1) @@ -124,7 +123,8 @@ GEM sprockets (2.0.3) hike (~> 1.2) rack (~> 1.0) - tilt (!= 1.3.0, ~> 1.1) + tilt (~> 1.1, != 1.3.0) + sqlite3 (1.3.4) thin (1.2.11) daemons (>= 1.0.9) eventmachine (>= 0.12.6) @@ -146,11 +146,11 @@ DEPENDENCIES coffee-rails (~> 3.1.1) jasmine jquery-rails - mysql2 rack (= 1.3.3) rails (= 3.1.1) rspec rspec-rails sass-rails (~> 3.1.4) + sqlite3 thin uglifier (>= 1.0.3)