diff options
-rw-r--r-- | Gemfile | 21 | ||||
-rw-r--r-- | Gemfile.lock | 36 |
2 files changed, 10 insertions, 47 deletions
@@ -1,24 +1,23 @@ +#!/usr/bin/ruby -h # not executable, but as a hint to text editors + source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '4.0.2' - # bcrypt is used for password digesting gem 'bcrypt-ruby', '3.1.2' group :development, :test do - -# Use sqlite3 as the database for Active Record + # Use sqlite3 as the database for Active Record gem 'sqlite3' - gem 'rspec-rails', '2.13.1' -end - -group :test do - gem 'selenium-webdriver', '2.35.1' - gem 'capybara', '2.1.0' end +# group :test do +# gem 'rspec-rails', '2.13.1' +# gem 'selenium-webdriver', '2.35.1' +# gem 'capybara', '2.1.0' +# end # Use SCSS for stylesheets gem 'sass-rails', '~> 4.0.0' @@ -43,8 +42,8 @@ gem 'turbolinks' gem 'jbuilder', '~> 1.2' group :doc do - # bundle exec rake doc:rails generates the API under doc/api. - gem 'sdoc', require: false + # bundle exec rake doc:rails generates the API under doc/api. + gem 'sdoc', require: false end diff --git a/Gemfile.lock b/Gemfile.lock index 9dd0199..7899a93 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -31,14 +31,6 @@ GEM bootstrap-sass (3.1.1.0) sass (~> 3.2) builder (3.1.4) - capybara (2.1.0) - mime-types (>= 1.16) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (~> 2.0) - childprocess (0.5.1) - ffi (~> 1.0, >= 1.0.11) coffee-rails (4.0.1) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.0) @@ -46,10 +38,8 @@ GEM coffee-script-source execjs coffee-script-source (1.7.0) - diff-lcs (1.2.5) erubis (2.7.0) execjs (2.0.2) - ffi (1.9.3) hike (1.2.3) i18n (0.6.9) jbuilder (1.5.3) @@ -64,11 +54,8 @@ GEM mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.25.1) - mini_portile (0.5.2) minitest (4.7.5) multi_json (1.8.4) - nokogiri (1.6.1) - mini_portile (~> 0.5.0) polyglot (0.3.4) rack (1.5.2) rack-test (0.6.2) @@ -90,18 +77,6 @@ GEM rdoc (4.1.1) json (~> 1.4) ref (1.0.5) - rspec-core (2.13.1) - rspec-expectations (2.13.0) - diff-lcs (>= 1.1.3, < 2.0) - rspec-mocks (2.13.1) - rspec-rails (2.13.1) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 2.13.0) - rspec-expectations (~> 2.13.0) - rspec-mocks (~> 2.13.0) - rubyzip (0.9.9) sass (3.2.14) sass-rails (4.0.1) railties (>= 4.0.0, < 5.0) @@ -110,11 +85,6 @@ GEM sdoc (0.4.0) json (~> 1.8) rdoc (~> 4.0, < 5.0) - selenium-webdriver (2.35.1) - childprocess (>= 0.2.5) - multi_json (~> 1.0) - rubyzip (< 1.0.0) - websocket (~> 1.0.4) sprockets (2.11.0) hike (~> 1.2) multi_json (~> 1.0) @@ -141,9 +111,6 @@ GEM uglifier (2.4.0) execjs (>= 0.3.0) json (>= 1.8.0) - websocket (1.0.7) - xpath (2.0.0) - nokogiri (~> 1.3) PLATFORMS ruby @@ -151,15 +118,12 @@ PLATFORMS DEPENDENCIES bcrypt-ruby (= 3.1.2) bootstrap-sass - capybara (= 2.1.0) coffee-rails (~> 4.0.0) jbuilder (~> 1.2) jquery-rails rails (= 4.0.2) - rspec-rails (= 2.13.1) sass-rails (~> 4.0.0) sdoc - selenium-webdriver (= 2.35.1) sqlite3 therubyracer turbolinks |