Skip to content
This repository has been archived by the owner on Apr 18, 2018. It is now read-only.

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@volmer
volmer committed Aug 25, 2014
1 parent 435cf79 commit c9822da
Show file tree
Hide file tree
Showing 2 changed files with 66 additions and 61 deletions.
15 changes: 8 additions & 7 deletions Gemfile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source 'http://rubygems.org'

# Gems used by the dummy application
gem 'rails', '~> 4.1.4'
gem 'rails', '~> 4.1.6.rc1'
gem 'jquery-rails'
gem 'sass-rails'
gem 'bootstrap-sass'
Expand All @@ -12,9 +12,10 @@ gemspec

# Development dependencies
gem 'coveralls', require: false
gem 'rspec-rails', '~> 3.0'
gem 'factory_girl_rails', '~> 4.2'
gem 'database_cleaner', '~> 1.3'
gem 'cucumber-rails', '~> 1.4', require: false
gem 'shoulda-matchers', '~> 2.6'
gem 'selenium-webdriver', '~> 2.42'
gem 'rspec-rails'
gem 'factory_girl_rails'
gem 'database_cleaner'
gem 'cucumber-rails', require: false
gem 'shoulda-matchers'
gem 'selenium-webdriver'
gem 'pry-rails'
112 changes: 58 additions & 54 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,27 @@ PATH
GEM
remote: http://rubygems.org/
specs:
actionmailer (4.1.4)
actionpack (= 4.1.4)
actionview (= 4.1.4)
mail (~> 2.5.4)
actionpack (4.1.4)
actionview (= 4.1.4)
activesupport (= 4.1.4)
actionmailer (4.1.6.rc1)
actionpack (= 4.1.6.rc1)
actionview (= 4.1.6.rc1)
mail (~> 2.5, >= 2.5.4)
actionpack (4.1.6.rc1)
actionview (= 4.1.6.rc1)
activesupport (= 4.1.6.rc1)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
actionview (4.1.4)
activesupport (= 4.1.4)
actionview (4.1.6.rc1)
activesupport (= 4.1.6.rc1)
builder (~> 3.1)
erubis (~> 2.7.0)
activemodel (4.1.4)
activesupport (= 4.1.4)
activemodel (4.1.6.rc1)
activesupport (= 4.1.6.rc1)
builder (~> 3.1)
activerecord (4.1.4)
activemodel (= 4.1.4)
activesupport (= 4.1.4)
activerecord (4.1.6.rc1)
activemodel (= 4.1.6.rc1)
activesupport (= 4.1.6.rc1)
arel (~> 5.0.0)
activesupport (4.1.4)
activesupport (4.1.6.rc1)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
Expand All @@ -52,7 +52,8 @@ GEM
mime-types (>= 1.16)
childprocess (0.5.3)
ffi (~> 1.0, >= 1.0.11)
coveralls (0.7.0)
coderay (1.1.0)
coveralls (0.7.1)
multi_json (~> 1.3)
rest-client
simplecov (>= 0.7)
Expand All @@ -64,12 +65,11 @@ GEM
gherkin (~> 2.12)
multi_json (>= 1.7.5, < 2.0)
multi_test (>= 0.1.1)
cucumber-rails (1.4.1)
capybara (>= 1.1.2, < 3)
cucumber (>= 1.3.8, < 2)
mime-types (~> 1.16)
nokogiri (~> 1.5)
rails (>= 3, < 5)
cucumber-rails (1.4.0)
capybara (>= 1.1.2)
cucumber (>= 1.2.0)
nokogiri (>= 1.5.0)
rails (>= 3.0.0)
database_cleaner (1.3.0)
diff-lcs (1.2.5)
docile (1.1.5)
Expand All @@ -88,10 +88,10 @@ GEM
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.1)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.25.1)
mail (2.6.1)
mime-types (>= 1.16, < 3)
method_source (0.8.2)
mime-types (2.3)
mini_magick (3.8.0)
subexec (~> 0.2.1)
mini_portile (0.6.0)
Expand All @@ -101,36 +101,41 @@ GEM
netrc (0.7.7)
nokogiri (1.6.3.1)
mini_portile (= 0.6.0)
polyglot (0.3.5)
pry (0.10.1)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pry-rails (0.3.2)
pry (>= 0.9.10)
rack (1.5.2)
rack-test (0.6.2)
rack (>= 1.0)
rails (4.1.4)
actionmailer (= 4.1.4)
actionpack (= 4.1.4)
actionview (= 4.1.4)
activemodel (= 4.1.4)
activerecord (= 4.1.4)
activesupport (= 4.1.4)
rails (4.1.6.rc1)
actionmailer (= 4.1.6.rc1)
actionpack (= 4.1.6.rc1)
actionview (= 4.1.6.rc1)
activemodel (= 4.1.6.rc1)
activerecord (= 4.1.6.rc1)
activesupport (= 4.1.6.rc1)
bundler (>= 1.3.0, < 2.0)
railties (= 4.1.4)
railties (= 4.1.6.rc1)
sprockets-rails (~> 2.0)
railties (4.1.4)
actionpack (= 4.1.4)
activesupport (= 4.1.4)
railties (4.1.6.rc1)
actionpack (= 4.1.6.rc1)
activesupport (= 4.1.6.rc1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.3.2)
remotipart (1.2.1)
rest-client (1.7.2)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
rspec-core (3.0.3)
rspec-core (3.0.4)
rspec-support (~> 3.0.0)
rspec-expectations (3.0.3)
rspec-expectations (3.0.4)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.0.0)
rspec-mocks (3.0.3)
rspec-mocks (3.0.4)
rspec-support (~> 3.0.0)
rspec-rails (3.0.2)
actionpack (>= 3.0)
Expand All @@ -140,7 +145,7 @@ GEM
rspec-expectations (~> 3.0.0)
rspec-mocks (~> 3.0.0)
rspec-support (~> 3.0.0)
rspec-support (3.0.3)
rspec-support (3.0.4)
rubyzip (1.1.6)
sass (3.2.19)
sass-rails (4.0.3)
Expand All @@ -163,6 +168,7 @@ GEM
multi_json
simplecov-html (~> 0.8.0)
simplecov-html (0.8.0)
slop (3.6.0)
sprockets (2.11.0)
hike (~> 1.2)
multi_json (~> 1.0)
Expand All @@ -179,11 +185,8 @@ GEM
thor (0.19.1)
thread_safe (0.3.4)
tilt (1.4.1)
tins (1.3.0)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (1.2.1)
tins (1.3.2)
tzinfo (1.2.2)
thread_safe (~> 0.1)
websocket (1.0.7)
xpath (2.0.0)
Expand All @@ -196,14 +199,15 @@ DEPENDENCIES
bootstrap-sass
bootsy!
coveralls
cucumber-rails (~> 1.4)
database_cleaner (~> 1.3)
factory_girl_rails (~> 4.2)
cucumber-rails
database_cleaner
factory_girl_rails
jquery-rails
rails (~> 4.1.4)
rspec-rails (~> 3.0)
pry-rails
rails (~> 4.1.6.rc1)
rspec-rails
sass-rails
selenium-webdriver (~> 2.42)
shoulda-matchers (~> 2.6)
selenium-webdriver
shoulda-matchers
simple_form (~> 3.1.0.rc2)
sqlite3 (~> 1.3)

0 comments on commit c9822da

Please sign in to comment.