team-alpha/railsgoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rebuilt Gemfile.lock file; Locked down rspec-rails to 2.14.2 since rspec 3.0.0 changes 'pending' meaning

Browse Source
This commit is contained in:
Al Snow
2014-06-03 10:10:13 -04:00
parent 4e61090891
commit 5c68943059
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gemfile
+1 -1
View File
@@ -38,7 +38,7 @@ group :development, :test, :mysql do
gem 'capybara' gem 'capybara'
gem 'database_cleaner' gem 'database_cleaner'
gem 'poltergeist' gem 'poltergeist'
gem 'rspec-rails' gem 'rspec-rails', '2.14.2'
end end
group :mysql do group :mysql do
Gemfile.lock
+12 -10
View File
@@ -55,7 +55,7 @@ GEM
bundler-audit (0.3.1) bundler-audit (0.3.1)
bundler (~> 1.2) bundler (~> 1.2)
thor (~> 0.18) thor (~> 0.18)
capybara (2.2.1) capybara (2.3.0)
mime-types (>= 1.16) mime-types (>= 1.16)
nokogiri (>= 1.3.3) nokogiri (>= 1.3.3)
rack (>= 1.0.0) rack (>= 1.0.0)
@@ -85,7 +85,9 @@ GEM
debug_inspector (0.0.2) debug_inspector (0.0.2)
diff-lcs (1.2.5) diff-lcs (1.2.5)
docile (1.1.3) docile (1.1.3)
dotenv (0.7.0) dotenv (0.11.1)
dotenv-deployment (~> 0.0.2)
dotenv-deployment (0.0.2)
em-websocket (0.5.1) em-websocket (0.5.1)
eventmachine (>= 0.12.9) eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0) http_parser.rb (~> 0.6.0)
@@ -94,8 +96,8 @@ GEM
execjs (2.1.0) execjs (2.1.0)
fastercsv (1.5.5) fastercsv (1.5.5)
ffi (1.9.3) ffi (1.9.3)
foreman (0.66.0) foreman (0.71.0)
dotenv (~> 0.7.0) dotenv (~> 0.11.1)
thor (~> 0.19.1) thor (~> 0.19.1)
formatador (0.2.5) formatador (0.2.5)
gauntlt (1.0.9) gauntlt (1.0.9)
@@ -142,11 +144,11 @@ GEM
launchy (2.4.2) launchy (2.4.2)
addressable (~> 2.3) addressable (~> 2.3)
libv8 (3.16.14.3) libv8 (3.16.14.3)
listen (2.7.5) listen (2.7.6)
celluloid (>= 0.15.2) celluloid (>= 0.15.2)
rb-fsevent (>= 0.9.3) rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9) rb-inotify (>= 0.9)
lumberjack (1.0.5) lumberjack (1.0.6)
mail (2.4.4) mail (2.4.4)
i18n (>= 0.4.0) i18n (>= 0.4.0)
mime-types (~> 1.16) mime-types (~> 1.16)
@@ -168,12 +170,12 @@ GEM
mysql2 (0.3.16) mysql2 (0.3.16)
nokogiri (1.6.1) nokogiri (1.6.1)
mini_portile (~> 0.5.0) mini_portile (~> 0.5.0)
poltergeist (1.5.0) poltergeist (1.5.1)
capybara (~> 2.1) capybara (~> 2.1)
cliver (~> 0.3.1) cliver (~> 0.3.1)
multi_json (~> 1.0) multi_json (~> 1.0)
websocket-driver (>= 0.2.0) websocket-driver (>= 0.2.0)
polyglot (0.3.4) polyglot (0.3.5)
powder (0.2.1) powder (0.2.1)
thor (>= 0.11.5) thor (>= 0.11.5)
pry (0.9.12.6) pry (0.9.12.6)
@@ -236,7 +238,7 @@ GEM
ruby_parser (3.4.1) ruby_parser (3.4.1)
sexp_processor (~> 4.1) sexp_processor (~> 4.1)
safe_yaml (0.9.7) safe_yaml (0.9.7)
sass (3.3.7) sass (3.3.8)
sass-rails (3.2.6) sass-rails (3.2.6)
railties (~> 3.2.0) railties (~> 3.2.0)
sass (>= 3.1.10) sass (>= 3.1.10)
@@ -328,7 +330,7 @@ DEPENDENCIES
rack-ssl (= 1.3.4) rack-ssl (= 1.3.4)
rails (= 3.2.11) rails (= 3.2.11)
rb-fsevent rb-fsevent
rspec-rails rspec-rails (= 2.14.2)
sass-rails sass-rails
simplecov simplecov
sqlite3 sqlite3