diff --git a/Gemfile b/Gemfile index 60b083e..2809c60 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ gem 'rails', '4.0.0' gem 'bcrypt-ruby', '~> 3.0.0' # Use sqlite3 as the database for Active Record -gem 'sqlite3' +#gem 'sqlite3' gem 'mysql2' # Use Uglifier as compressor for JavaScript assets @@ -27,7 +27,7 @@ gem 'turbolinks' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder gem 'jbuilder', '~> 1.0.1' -gem "therubyracer" +gem "therubyracer", group: :production gem "less-rails" gem "twitter-bootstrap-rails" diff --git a/Gemfile.lock b/Gemfile.lock index 1e88347..e54ab51 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -75,14 +75,14 @@ GEM jquery-rails (3.0.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.8.0) + json (1.8.6) kaminari (0.14.1) actionpack (>= 3.0.0) activesupport (>= 3.0.0) kaminari-bootstrap (0.1.3) kaminari (>= 0.13.0) rails - kgio (2.8.0) + kgio (2.11.2) less (2.3.2) commonjs (~> 0.2.6) less-rails (2.3.3) @@ -96,7 +96,7 @@ GEM mini_portile (0.5.1) minitest (4.7.5) multi_json (1.7.7) - mysql2 (0.3.13) + mysql2 (0.3.21) net-scp (1.1.2) net-ssh (>= 2.6.5) net-sftp (2.1.2) @@ -143,7 +143,6 @@ GEM actionpack (>= 3.0) activesupport (>= 3.0) sprockets (~> 2.8) - sqlite3 (1.3.7) therubyracer (0.11.4) libv8 (~> 3.11.8.12) ref @@ -192,9 +191,11 @@ DEPENDENCIES rmagick rvm-capistrano sdoc - sqlite3 therubyracer turbolinks twitter-bootstrap-rails uglifier (>= 1.3.0) unicorn + +BUNDLED WITH + 1.16.4