Merge branch 'master' into refactor-devise-integration

This commit is contained in:
Artur Beljajev 2018-07-13 14:23:10 +03:00
commit d708c82bd0

View file

@ -127,13 +127,13 @@ GEM
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
uniform_notifier (~> 1.9.0) uniform_notifier (~> 1.9.0)
cancancan (1.11.0) cancancan (1.11.0)
capybara (2.14.0) capybara (3.3.1)
addressable addressable
mime-types (>= 1.16) mini_mime (>= 0.1.3)
nokogiri (>= 1.3.3) nokogiri (~> 1.8)
rack (>= 1.0.0) rack (>= 1.6.0)
rack-test (>= 0.5.4) rack-test (>= 0.6.3)
xpath (~> 2.0) xpath (~> 3.1)
childprocess (0.9.0) childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11) ffi (~> 1.0, >= 1.0.11)
chronic (0.10.2) chronic (0.10.2)
@ -271,7 +271,7 @@ GEM
multi_json (1.12.1) multi_json (1.12.1)
multi_xml (0.6.0) multi_xml (0.6.0)
netrc (0.11.0) netrc (0.11.0)
nokogiri (1.8.2) nokogiri (1.8.4)
mini_portile2 (~> 2.3.0) mini_portile2 (~> 2.3.0)
nori (2.6.0) nori (2.6.0)
open4 (1.3.4) open4 (1.3.4)
@ -444,8 +444,8 @@ GEM
hashdiff hashdiff
whenever (0.9.4) whenever (0.9.4)
chronic (>= 0.6.3) chronic (>= 0.6.3)
xpath (2.0.0) xpath (3.1.0)
nokogiri (~> 1.3) nokogiri (~> 1.8)
PLATFORMS PLATFORMS
ruby ruby