Merge pull request #131 from jasnow/master

Upgraded 4 gems by rebuilding Gemfile.lock file
This commit is contained in:
Ken Johnson
2014-06-24 19:17:51 -04:00
+5 -5
View File
@@ -74,12 +74,12 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.7.0)
cucumber (1.3.11)
cucumber (1.3.15)
builder (>= 2.1.2)
diff-lcs (>= 1.1.3)
gherkin (~> 2.12)
multi_json (>= 1.7.5, < 2.0)
multi_test (>= 0.0.2)
multi_test (>= 0.1.1)
daemons (1.1.9)
database_cleaner (1.3.0)
debug_inspector (0.0.2)
@@ -100,9 +100,9 @@ GEM
dotenv (~> 0.11.1)
thor (~> 0.19.1)
formatador (0.2.5)
gauntlt (1.0.9)
gauntlt (1.0.10)
aruba (= 0.5.4)
cucumber (= 1.3.11)
cucumber (= 1.3.15)
nokogiri (= 1.6.1)
trollop (~> 2.0)
gherkin (2.12.2)
@@ -136,7 +136,7 @@ GEM
jquery-fileupload-rails (0.4.1)
actionpack (>= 3.1)
railties (>= 3.1)
jquery-rails (3.1.0)
jquery-rails (3.1.1)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.1)