update gemfile again and fix failing test

This commit is contained in:
Reinier Balt 2014-01-31 17:44:54 +01:00
parent d14dc9a00c
commit 1649d95374
2 changed files with 34 additions and 31 deletions

View file

@ -18,7 +18,7 @@ GEM
remote: https://rubygems.org/
specs:
RedCloth (4.2.9)
aasm (3.0.26)
aasm (3.1.0)
actionmailer (4.0.2)
actionpack (= 4.0.2)
mail (~> 2.5.4)
@ -71,7 +71,7 @@ GEM
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.6.3)
coffee-script-source (1.7.0)
cucumber (1.3.10)
builder (>= 2.1.2)
diff-lcs (>= 1.1.3)
@ -99,7 +99,7 @@ GEM
hike (1.2.3)
htmlentities (4.3.1)
i18n (0.6.9)
jquery-rails (3.0.4)
jquery-rails (3.1.0)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.1)