Merge pull request #326313 from helsinki-systems/oxidized_0.30.1

oxidized: 0.29.1 -> 0.30.1

pkgs/tools/admin/oxidized/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
-gem 'oxidized', '0.29.1'
-gem 'oxidized-web', '0.13.1'
+gem 'oxidized', '0.30.1'
+gem 'oxidized-web', '0.14.0'
 
 # The version on rubygems is not up2date
 gem 'oxidized-script', git: 'https://github.com/ytti/oxidized-script.git', ref: '988cded5d89f52e274afb545bd3e011e19d5d22d'

pkgs/tools/admin/oxidized/Gemfile.lock

@@ -11,80 +11,92 @@ GEM
  remote: https://rubygems.org/
  specs:
  asetus (0.4.0)
- backports (3.24.1)
- bcrypt_pbkdf (1.1.0)
- charlock_holmes (0.7.7)
+ base64 (0.2.0)
+ bcrypt_pbkdf (1.1.1)
+ charlock_holmes (0.7.9)
+ date (3.3.4)
  ed25519 (1.3.0)
  emk-sinatra-url-for (0.2.1)
  sinatra (>= 0.9.1.1)
- ffi (1.15.5)
- haml (5.2.2)
- temple (>= 0.8.0)
+ haml (6.3.0)
+  temple (>= 0.8.2)
+ thor
  tilt
  htmlentities (4.3.4)
- json (2.6.3)
+ json (2.7.2)
  multi_json (1.15.0)
- net-ssh (7.1.0)
+ mustermann (3.0.0)
+ ruby2_keywords (~> 0.0.1)
+ net-ftp (0.3.7)
+ net-protocol
+ time
+ net-protocol (0.2.2)
+ timeout
+ net-scp (4.0.0)
+ net-ssh (>= 2.6.5, < 8.0.0)
+ net-ssh (7.2.3)
  net-telnet (0.2.0)
- oxidized (0.29.1)
+ nio4r (2.7.3)
+ oxidized (0.30.1)
  asetus (~> 0.1)
  bcrypt_pbkdf (~> 1.0)
  ed25519 (~> 1.2)
+ net-ftp (~> 0.2)
+ net-scp (~> 4.0)
  net-ssh (~> 7.1)
  net-telnet (~> 0.2)
+ psych (~> 3.3.2)
  rugged (~> 1.6)
  slop (~> 4.6)
- oxidized-web (0.13.1)
+ oxidized-web (0.14.0)
  charlock_holmes (~> 0.7.5)
  emk-sinatra-url-for (~> 0.2)
- haml (~> 5.0)
+ haml (~> 6.0)
  htmlentities (~> 4.3)
- json (>= 1.7.0)
+ json (~> 2.3)
  oxidized (~> 0.26)
- puma (~> 3.11.4)
- rack-test (~> 0.7.0)
- sass (~> 3.3)
- sinatra (~> 1.4, >= 1.4.6)
- sinatra-contrib (~> 1.4, >= 1.4.6)
+ puma (>= 3.11.4, < 6.5.0)
+ sinatra (>= 1.4.6, < 5.0)
+ sinatra-contrib (>= 1.4.6, < 5.0)
  psych (3.3.4)
- puma (3.11.4)
- rack (1.6.13)
- rack-protection (1.5.5)
- rack
- rack-test (0.7.0)
- rack (>= 1.0, < 3)
- rb-fsevent (0.11.2)
- rb-inotify (0.10.1)
- ffi (~> 1.0)
- rugged (1.6.3)
- sass (3.7.4)
- sass-listen (~> 4.0.0)
- sass-listen (4.0.0)
- rb-fsevent (~> 0.9, >= 0.9.4)
- rb-inotify (~> 0.9, >= 0.9.7)
- sinatra (1.4.8)
- rack (~> 1.5)
- rack-protection (~> 1.4)
- tilt (>= 1.3, < 3)
- sinatra-contrib (1.4.7)
- backports (>= 2.0)
- multi_json
- rack-protection
- rack-test
- sinatra (~> 1.4.0)
- tilt (>= 1.3, < 3)
+ puma (6.4.2)
+ nio4r (~> 2.0)
+ rack (3.1.7)
+ rack-protection (4.0.0)
+ base64 (>= 0.1.0)
+ rack (>= 3.0.0, < 4)
+ rack-session (2.0.0)
+ rack (>= 3.0.0)
+ ruby2_keywords (0.0.5)
+ rugged (1.7.2)
+ sinatra (4.0.0)
+ mustermann (~> 3.0)
+ rack (>= 3.0.0, < 4)
+ rack-protection (= 4.0.0)
+ rack-session (>= 2.0.0, < 3)
+ tilt (~> 2.0)
+ sinatra-contrib (4.0.0)
+ multi_json (>= 0.0.2)
+ mustermann (~> 3.0)
+ rack-protection (= 4.0.0)
+ sinatra (= 4.0.0)
+ tilt (~> 2.0)
  slop (4.10.1)
- temple (0.10.1)
- tilt (2.1.0)
+ temple (0.10.3)
+ thor (1.3.1)
+ tilt (2.4.0)
+ time (0.3.0)
+ date
+ timeout (0.4.1)
 
 PLATFORMS
  x86_64-linux
 
 DEPENDENCIES
- oxidized (= 0.29.1)
+ oxidized (= 0.30.1)
  oxidized-script!
- oxidized-web (= 0.13.1)
+ oxidized-web (= 0.14.0)
  psych (~> 3.3.2)
 
 BUNDLED WITH
- 2.3.26
+ 2.5.9