Merge pull request #77 from jasnow/master
Upgraded 6+4 gems and then rebuilt Gemfile.lock file
This commit is contained in:
+12
-12
@@ -40,7 +40,7 @@ GEM
|
||||
erubis (>= 2.6.6)
|
||||
binding_of_caller (0.7.2)
|
||||
debug_inspector (>= 0.0.1)
|
||||
brakeman (2.2.0)
|
||||
brakeman (2.3.1)
|
||||
erubis (~> 2.6)
|
||||
fastercsv (~> 1.5)
|
||||
haml (>= 3.0, < 5.0)
|
||||
@@ -54,7 +54,7 @@ GEM
|
||||
builder (3.0.4)
|
||||
bundler-audit (0.3.0)
|
||||
bundler (~> 1.2)
|
||||
capybara (2.1.0)
|
||||
capybara (2.2.0)
|
||||
mime-types (>= 1.16)
|
||||
nokogiri (>= 1.3.3)
|
||||
rack (>= 1.0.0)
|
||||
@@ -64,7 +64,7 @@ GEM
|
||||
timers (~> 1.1.0)
|
||||
childprocess (0.3.9)
|
||||
ffi (~> 1.0, >= 1.0.11)
|
||||
cliver (0.2.2)
|
||||
cliver (0.3.2)
|
||||
coderay (1.1.0)
|
||||
coffee-rails (3.2.2)
|
||||
coffee-script (>= 2.2.0)
|
||||
@@ -104,7 +104,7 @@ GEM
|
||||
trollop
|
||||
gherkin (2.12.2)
|
||||
multi_json (~> 1.3)
|
||||
guard (2.2.4)
|
||||
guard (2.2.5)
|
||||
formatador (>= 0.2.4)
|
||||
listen (~> 2.1)
|
||||
lumberjack (~> 1.0)
|
||||
@@ -164,10 +164,10 @@ GEM
|
||||
mime-types (1.25.1)
|
||||
multi_json (1.8.2)
|
||||
multi_test (0.0.2)
|
||||
nokogiri (1.5.10)
|
||||
poltergeist (1.4.1)
|
||||
capybara (~> 2.1.0)
|
||||
cliver (~> 0.2.1)
|
||||
nokogiri (1.5.11)
|
||||
poltergeist (1.5.0)
|
||||
capybara (~> 2.1)
|
||||
cliver (~> 0.3.1)
|
||||
multi_json (~> 1.0)
|
||||
websocket-driver (>= 0.2.0)
|
||||
polyglot (0.3.3)
|
||||
@@ -206,7 +206,7 @@ GEM
|
||||
raindrops (0.12.0)
|
||||
rake (10.1.0)
|
||||
rb-fsevent (0.9.3)
|
||||
rb-inotify (0.9.2)
|
||||
rb-inotify (0.9.3)
|
||||
ffi (>= 0.5.0)
|
||||
rdoc (3.12.2)
|
||||
json (~> 1.4)
|
||||
@@ -226,7 +226,7 @@ GEM
|
||||
rspec-core (~> 2.14.0)
|
||||
rspec-expectations (~> 2.14.0)
|
||||
rspec-mocks (~> 2.14.0)
|
||||
ruby2ruby (2.0.6)
|
||||
ruby2ruby (2.0.7)
|
||||
ruby_parser (~> 3.1)
|
||||
sexp_processor (~> 4.0)
|
||||
ruby_parser (3.2.2)
|
||||
@@ -236,7 +236,7 @@ GEM
|
||||
railties (~> 3.2.0)
|
||||
sass (>= 3.1.10)
|
||||
tilt (~> 1.3)
|
||||
sexp_processor (4.4.0)
|
||||
sexp_processor (4.4.1)
|
||||
simplecov (0.8.0.pre2)
|
||||
docile (~> 1.1.0)
|
||||
lockfile (>= 2.1.0)
|
||||
@@ -279,7 +279,7 @@ GEM
|
||||
polyglot (>= 0.3.1)
|
||||
trollop (2.0)
|
||||
tzinfo (0.3.38)
|
||||
uglifier (2.3.2)
|
||||
uglifier (2.3.3)
|
||||
execjs (>= 0.3.0)
|
||||
json (>= 1.8.0)
|
||||
unicorn (4.7.0)
|
||||
|
||||
Reference in New Issue
Block a user