Browse files

updated deps

  • Loading branch information...
1 parent d42e80d commit 7bced61625d06eb45839df2c15f276bdf923a95c @kristianmandrup committed Dec 8, 2011
Showing with 19 additions and 19 deletions.
  1. +9 −9 Gemfile
  2. +10 −10 Gemfile.lock
View
18 Gemfile
@@ -5,24 +5,24 @@ group :default do
gem 'cancan', '>= 1.4'
gem 'sugar-high', '>= 0.6.0'
gem 'sweetloader', '~> 0.1.5'
- gem 'hashie'
+ gem 'hashie', '~> 1.2'
end
group :test do
- gem 'require_all', '~> 1.2.0'
+ gem 'require_all', '~> 1.2.0'
- gem 'cancan', '>= 1.4'
+ gem 'cancan', '>= 1.4'
# Data
gem 'database_cleaner'
gem 'factory_girl'
# Adapters
- gem 'activerecord', '>= 3'
- gem 'datamapper', '>= 1.1'
- gem 'mongoid', '>= 2.2'
- gem 'mongo_mapper', '>= 0.9'
+ gem 'activerecord', '>= 3'
+ gem 'datamapper', '>= 1.1'
+ gem 'mongoid', '>= 2.2'
+ gem 'mongo_mapper', '>= 0.9'
# Specs
gem 'spork'
@@ -47,8 +47,8 @@ group :test do
end
group :development, :test do
- gem "rspec-rails", '>= 2.6.1' # needed in development to expose the rails generators
- gem 'forgery', '>= 0.3' # needed in development when using rake db:seed
+ gem "rspec-rails", '>= 2.6.1' # needed in development to expose the rails generators
+ gem 'forgery', '>= 0.3' # needed in development when using rake db:seed
gem 'factory_girl'
gem 'sqlite3'
end
View
20 Gemfile.lock
@@ -33,7 +33,7 @@ GEM
arel (2.2.1)
babosa (0.3.5)
bcrypt-ruby (3.0.1)
- bson (1.4.0)
+ bson (1.5.1)
builder (3.0.0)
cancan (1.6.7)
capybara (1.1.2)
@@ -134,8 +134,8 @@ GEM
bundler (~> 1.0)
git (>= 1.2.5)
rake
- json (1.6.2)
- json_pure (1.6.1)
+ json (1.6.3)
+ json_pure (1.6.3)
launchy (2.0.5)
addressable (~> 2.2.6)
mail (2.3.0)
@@ -151,8 +151,8 @@ GEM
mime-types (1.17.2)
mocha (0.10.0)
metaclass (~> 0.0.1)
- mongo (1.4.0)
- bson (= 1.4.0)
+ mongo (1.5.1)
+ bson (= 1.5.1)
mongo_mapper (0.10.1)
activemodel (~> 3.0)
activesupport (~> 3.0)
@@ -222,7 +222,7 @@ GEM
railties (~> 3.0)
rspec (~> 2.7.0)
rubyzip (0.9.5)
- selenium-webdriver (2.14.0)
+ selenium-webdriver (2.15.0)
childprocess (>= 0.2.1)
ffi (~> 1.0.9)
multi_json (~> 1.0.4)
@@ -232,11 +232,11 @@ GEM
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- sqlite3 (1.3.4)
+ sqlite3 (1.3.5)
stringex (1.3.0)
- sugar-high (0.6.0)
+ sugar-high (0.6.2.1)
activesupport (>= 3.0.1)
- sweetloader (0.1.5)
+ sweetloader (0.1.6)
activesupport (>= 3.0.1)
i18n
test-unit (2.4.2)
@@ -270,7 +270,7 @@ DEPENDENCIES
friendly_id
generator-spec (>= 0.7.8)
haml
- hashie
+ hashie (~> 1.2)
jeweler (>= 1.6.4)
launchy
mocha

0 comments on commit 7bced61

Please sign in to comment.