Skip to content

Commit

Permalink
Merge 5d5fe7d into a1cf102
Browse files Browse the repository at this point in the history
  • Loading branch information
vkoves committed Aug 15, 2018
2 parents a1cf102 + 5d5fe7d commit f003e89
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,14 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.0.4)
concurrent-ruby (1.0.5)
coveralls (0.8.21)
json (>= 1.8, < 3)
simplecov (~> 0.14.1)
term-ansicolor (~> 1.3)
thor (~> 0.19.4)
tins (~> 1.6)
crass (1.0.4)
debug_inspector (0.0.2)
devise (4.2.0)
bcrypt (~> 3.0)
Expand Down Expand Up @@ -130,7 +131,8 @@ GEM
listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
loofah (2.0.3)
loofah (2.2.2)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.6.4)
mime-types (>= 1.16, < 4)
Expand All @@ -145,7 +147,7 @@ GEM
mustermann (1.0.2)
mysql2 (0.3.21)
nio4r (1.2.1)
nokogiri (1.8.1)
nokogiri (1.8.4)
mini_portile2 (~> 2.3.0)
orm_adapter (0.5.0)
parallel (1.12.1)
Expand All @@ -157,7 +159,7 @@ GEM
method_source (~> 0.8.1)
slop (~> 3.4)
puma (3.7.1)
rack (2.0.1)
rack (2.0.5)
rack-protection (2.0.2)
rack
rack-test (0.6.3)
Expand All @@ -181,8 +183,8 @@ GEM
rails-dom-testing (2.0.2)
activesupport (>= 4.2.0, < 6.0)
nokogiri (~> 1.6)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
rails-settings-cached (0.6.6)
rails (>= 4.2.0)
rails-settings-ui (1.3.1)
Expand Down Expand Up @@ -243,7 +245,7 @@ GEM
spring-watcher-listen (2.0.1)
listen (>= 2.7, < 4.0)
spring (>= 1.2, < 3.0)
sprockets (3.7.1)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.0)
Expand Down Expand Up @@ -316,4 +318,4 @@ RUBY VERSION
ruby 2.3.0p0

BUNDLED WITH
1.16.2
1.16.3

0 comments on commit f003e89

Please sign in to comment.