Merge pull request #88 from jasnow/master

Rebuilt Gemfile.lock file by upgrading 6 gems
This commit is contained in:
mccabe615
2014-02-03 12:23:32 -08:00
+6 -6
View File
@@ -72,7 +72,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)
@@ -133,7 +133,7 @@ GEM
jquery-fileupload-rails (0.4.1)
actionpack (>= 3.1)
railties (>= 3.1)
jquery-rails (3.0.4)
jquery-rails (3.1.0)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.1)
@@ -172,7 +172,7 @@ GEM
polyglot (0.3.3)
powder (0.2.0)
thor (>= 0.11.5)
pry (0.9.12.4)
pry (0.9.12.6)
coderay (~> 1.0)
method_source (~> 0.8)
slop (~> 3.4)
@@ -215,9 +215,9 @@ GEM
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
rspec-core (2.14.7)
rspec-expectations (2.14.4)
rspec-expectations (2.14.5)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.14.4)
rspec-mocks (2.14.5)
rspec-rails (2.14.1)
actionpack (>= 3.0)
activemodel (>= 3.0)
@@ -281,7 +281,7 @@ GEM
uglifier (2.4.0)
execjs (>= 0.3.0)
json (>= 1.8.0)
unicorn (4.8.0)
unicorn (4.8.1)
kgio (~> 2.6)
rack
raindrops (~> 0.7)