nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #8357 from SuperTux88/gem-updates

Browse source 
Gem updates
This commit is contained in:
Benjamin Neff 2022-06-28 00:43:11 +02:00
commit 2d9f133d30
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
5 changed files with 226 additions and 234 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
Gemfile
View file

@ -2,7 +2,7 @@
source "https://rubygems.org" source "https://rubygems.org"
gem "rails", "5.2.7.1" gem "rails", "5.2.8"
# Legacy Rails features, remove me! # Legacy Rails features, remove me!
# responders (class level) # responders (class level)
@ -10,7 +10,7 @@ gem "responders", "3.0.1"
# Appserver # Appserver
gem "unicorn", "6.0.0", require: false gem "unicorn", "6.1.0", require: false
gem "unicorn-worker-killer", "0.4.5" gem "unicorn-worker-killer", "0.4.5"
# Federation # Federation
@ -21,15 +21,15 @@ gem "diaspora_federation-rails", "0.2.7"
# API and JSON # API and JSON
gem "acts_as_api", "1.0.1" gem "acts_as_api", "1.0.1"
gem "json", "2.3.0" gem "json", "2.6.2"
gem "json-schema", "2.8.1" gem "json-schema", "3.0.0"
# Authentication # Authentication
gem "devise", "4.8.0" gem "devise", "4.8.1"
gem "devise_lastseenable", "0.0.6" gem "devise_lastseenable", "0.0.6"
gem "devise-two-factor", "4.0.1" gem "devise-two-factor", "4.0.2"
gem "rqrcode", "2.1.0" gem "rqrcode", "2.1.1"
# Captcha # Captcha
@ -37,21 +37,21 @@ gem "simple_captcha2", "0.5.0", require: "simple_captcha"
# Background processing # Background processing
gem "redis", "4.5.1" gem "redis", "4.7.0"
gem "sidekiq", "6.2.2" gem "sidekiq", "6.4.2"
# Scheduled processing # Scheduled processing
gem "sidekiq-cron", "1.2.0" gem "sidekiq-cron", "1.4.0"
# Compression # Compression
gem "terser", "1.1.7" gem "terser", "1.1.10"
# Configuration # Configuration
gem "configurate", "0.5.0" gem "configurate", "0.5.0"
gem "toml-rb", "2.1.0" gem "toml-rb", "2.1.2"
# Cross-origin resource sharing # Cross-origin resource sharing
@ -59,28 +59,28 @@ gem "rack-cors", "1.1.1", require: "rack/cors"
# CSS # CSS
gem "autoprefixer-rails", "10.3.3.0" gem "autoprefixer-rails", "10.4.7.0"
gem "bootstrap-sass", "3.4.1" gem "bootstrap-sass", "3.4.1"
gem "bootstrap-switch-rails", "3.3.3" # 3.3.4 and 3.3.5 is broken, see https://github.com/Bttstrp/bootstrap-switch/issues/691 gem "bootstrap-switch-rails", "3.3.3" # 3.3.4 and 3.3.5 is broken, see https://github.com/Bttstrp/bootstrap-switch/issues/691
gem "compass-rails", "3.1.0" gem "compass-rails", "3.1.0"
gem "sass-rails", "5.0.7" gem "sass-rails", "5.0.7"
gem "sprockets-rails", "3.2.2" gem "sprockets-rails", "3.4.2"
# Database # Database
group :mysql, optional: true do group :mysql, optional: true do
gem "mysql2", "0.5.3" gem "mysql2", "0.5.4"
end end
group :postgresql, optional: true do group :postgresql, optional: true do
gem "pg", "1.2.3" gem "pg", "1.4.1"
end end
gem "activerecord-import", "1.1.0" gem "activerecord-import", "1.4.0"
# File uploading # File uploading
gem "carrierwave", "2.2.2" gem "carrierwave", "2.2.2"
gem "fog-aws", "3.12.0" gem "fog-aws", "3.14.0"
gem "mini_magick", "4.11.0" gem "mini_magick", "4.11.0"
# GUID generation # GUID generation
@ -93,12 +93,12 @@ gem "entypo-rails", "3.0.0"
# JavaScript # JavaScript
gem "handlebars_assets", "0.23.9" gem "handlebars_assets", "0.23.9"
gem "jquery-rails", "4.4.0" gem "jquery-rails", "4.5.0"
gem "js-routes", "2.1.2" gem "js-routes", "2.2.4"
gem "js_image_paths", "0.1.1" gem "js_image_paths", "0.1.1"
source "https://gems.diasporafoundation.org" do source "https://gems.diasporafoundation.org" do
gem "rails-assets-jquery", "3.5.1" # Should be kept in sync with jquery-rails gem "rails-assets-jquery", "3.6.0" # Should be kept in sync with jquery-rails
gem "rails-assets-jquery.ui", "1.11.4" gem "rails-assets-jquery.ui", "1.11.4"
gem "rails-assets-highlightjs", "9.12.0" gem "rails-assets-highlightjs", "9.12.0"
@ -112,6 +112,7 @@ source "https://gems.diasporafoundation.org" do
gem "rails-assets-markdown-it-sup", "1.0.0" gem "rails-assets-markdown-it-sup", "1.0.0"
gem "rails-assets-backbone", "1.3.3" gem "rails-assets-backbone", "1.3.3"
gem "rails-assets-bootstrap", "3.4.1"
gem "rails-assets-bootstrap-markdown", "2.10.0" gem "rails-assets-bootstrap-markdown", "2.10.0"
gem "rails-assets-corejs-typeahead", "1.2.1" gem "rails-assets-corejs-typeahead", "1.2.1"
gem "rails-assets-fine-uploader", "5.13.0" gem "rails-assets-fine-uploader", "5.13.0"
@ -146,7 +147,7 @@ gem "leaflet-rails", "1.7.0"
gem "nokogiri", "1.12.5" gem "nokogiri", "1.12.5"
gem "open_graph_reader", "0.7.2" # also update User-Agent in features/support/webmock.rb and open_graph_cache_spec.rb gem "open_graph_reader", "0.7.2" # also update User-Agent in features/support/webmock.rb and open_graph_cache_spec.rb
gem "redcarpet", "3.5.1" gem "redcarpet", "3.5.1"
gem "ruby-oembed", "0.15.0" gem "ruby-oembed", "0.16.1"
gem "twitter-text", "1.14.7" gem "twitter-text", "1.14.7"
# RTL support # RTL support
@ -159,8 +160,8 @@ gem "secure_headers", "6.3.3"
# Services # Services
gem "omniauth", "2.0.4" gem "omniauth", "2.1.0"
gem "omniauth-rails_csrf_protection", "1.0.0" gem "omniauth-rails_csrf_protection", "1.0.1"
gem "omniauth-tumblr", "1.2" gem "omniauth-tumblr", "1.2"
gem "omniauth-twitter", "1.4.0" gem "omniauth-twitter", "1.4.0"
gem "omniauth-wordpress", "0.2.2" gem "omniauth-wordpress", "0.2.2"
@ -171,7 +172,7 @@ gem "openid_connect", "1.3.0"
# Serializers # Serializers
gem "active_model_serializers", "0.9.7" gem "active_model_serializers", "0.9.8"
# XMPP chat dependencies # XMPP chat dependencies
gem "diaspora-prosody-config", "0.0.7" gem "diaspora-prosody-config", "0.0.7"
@ -184,7 +185,7 @@ gem "acts-as-taggable-on", "8.1.0"
# URIs and HTTP # URIs and HTTP
gem "addressable", "2.8.0", require: "addressable/uri" gem "addressable", "2.8.0", require: "addressable/uri"
gem "faraday", "0.17.4" gem "faraday", "0.17.5"
gem "faraday-cookie_jar", "0.0.7" gem "faraday-cookie_jar", "0.0.7"
gem "faraday_middleware", "0.14.0" gem "faraday_middleware", "0.14.0"
gem "typhoeus", "1.4.0" gem "typhoeus", "1.4.0"
@ -192,9 +193,9 @@ gem "typhoeus", "1.4.0"
# Views # Views
gem "gon", "6.4.0" gem "gon", "6.4.0"
gem "hamlit", "2.15.1" gem "hamlit", "2.16.0"
gem "mobile-fu", "1.4.0" gem "mobile-fu", "1.4.0"
gem "rails-timeago", "2.19.1" gem "rails-timeago", "2.20.0"
gem "will_paginate", "3.3.1" gem "will_paginate", "3.3.1"
# Logging # Logging
@ -210,7 +211,7 @@ gem "rubyzip", "2.3.2", require: "zip"
# https://github.com/gitlabhq/gitlabhq/issues/3826 # https://github.com/gitlabhq/gitlabhq/issues/3826
# https://github.com/gitlabhq/gitlabhq/pull/3852 # https://github.com/gitlabhq/gitlabhq/pull/3852
# https://github.com/discourse/discourse/pull/238 # https://github.com/discourse/discourse/pull/238
gem "minitest" gem "minitest", "5.15.0"
gem "versionist", "2.0.1" gem "versionist", "2.0.1"
@ -238,15 +239,15 @@ group :production do # we don"t install these on travis to speed up test runs
# Third party asset hosting # Third party asset hosting
gem "asset_sync", "2.15.0", require: false gem "asset_sync", "2.15.2", require: false
end end
group :development do group :development do
# Linters # Linters
gem "haml_lint", "0.37.1", require: false gem "haml_lint", "0.40.0", require: false
gem "pronto", "0.11.0", require: false gem "pronto", "0.11.0", require: false
gem "pronto-eslint", "0.11.0", require: false gem "pronto-eslint", "0.11.0", require: false
gem "pronto-haml", "0.11.0", require: false gem "pronto-haml", "0.11.1", require: false
gem "pronto-rubocop", "0.11.1", require: false gem "pronto-rubocop", "0.11.1", require: false
gem "pronto-scss", "0.11.0", require: false gem "pronto-scss", "0.11.0", require: false
gem "rubocop", "0.93.1", require: false gem "rubocop", "0.93.1", require: false
@ -261,7 +262,7 @@ group :development do
gem "turbo_dev_assets", "0.0.2" gem "turbo_dev_assets", "0.0.2"
gem "listen", "3.5.1" gem "listen", "3.7.1"
end end
group :test do group :test do
@ -269,7 +270,6 @@ group :test do
gem "fixture_builder", "0.5.2" gem "fixture_builder", "0.5.2"
gem "fuubar", "2.5.1" gem "fuubar", "2.5.1"
gem "json-schema-rspec", "0.0.4"
gem "rspec-json_expectations", "~> 2.1" gem "rspec-json_expectations", "~> 2.1"
# Cucumber (integration tests) # Cucumber (integration tests)
@ -284,7 +284,7 @@ group :test do
gem "factory_girl_rails", "4.9.0" gem "factory_girl_rails", "4.9.0"
gem "shoulda-matchers", "4.5.1" gem "shoulda-matchers", "4.5.1"
gem "timecop", "0.9.4" gem "timecop", "0.9.5"
gem "webmock", "3.14.0", require: false gem "webmock", "3.14.0", require: false
gem "diaspora_federation-test", "0.2.7" gem "diaspora_federation-test", "0.2.7"
@ -292,10 +292,10 @@ end
group :development, :test do group :development, :test do
# RSpec (unit tests, some integration tests) # RSpec (unit tests, some integration tests)
gem "rspec-rails", "5.0.2" gem "rspec-rails", "5.1.2"
# Cucumber (integration tests) # Cucumber (integration tests)
gem "cucumber-rails", "2.4.0", require: false gem "cucumber-rails", "2.5.1", require: false
# Jasmine (client side application tests (JS)) # Jasmine (client side application tests (JS))
gem "chrome_remote", "0.3.0" gem "chrome_remote", "0.3.0"

378
Gemfile.lock
View file

@ -2,48 +2,48 @@ GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
remote: https://gems.diasporafoundation.org/ remote: https://gems.diasporafoundation.org/
specs: specs:
actioncable (5.2.7.1) actioncable (5.2.8)
actionpack (= 5.2.7.1) actionpack (= 5.2.8)
nio4r (~> 2.0) nio4r (~> 2.0)
websocket-driver (>= 0.6.1) websocket-driver (>= 0.6.1)
actionmailer (5.2.7.1) actionmailer (5.2.8)
actionpack (= 5.2.7.1) actionpack (= 5.2.8)
actionview (= 5.2.7.1) actionview (= 5.2.8)
activejob (= 5.2.7.1) activejob (= 5.2.8)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
actionpack (5.2.7.1) actionpack (5.2.8)
actionview (= 5.2.7.1) actionview (= 5.2.8)
activesupport (= 5.2.7.1) activesupport (= 5.2.8)
rack (~> 2.0, >= 2.0.8) rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2) rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.7.1) actionview (5.2.8)
activesupport (= 5.2.7.1) activesupport (= 5.2.8)
builder (~> 3.1) builder (~> 3.1)
erubi (~> 1.4) erubi (~> 1.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3) rails-html-sanitizer (~> 1.0, >= 1.0.3)
active_model_serializers (0.9.7) active_model_serializers (0.9.8)
activemodel (>= 3.2) activemodel (>= 3.2)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
activejob (5.2.7.1) activejob (5.2.8)
activesupport (= 5.2.7.1) activesupport (= 5.2.8)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (5.2.7.1) activemodel (5.2.8)
activesupport (= 5.2.7.1) activesupport (= 5.2.8)
activerecord (5.2.7.1) activerecord (5.2.8)
activemodel (= 5.2.7.1) activemodel (= 5.2.8)
activesupport (= 5.2.7.1) activesupport (= 5.2.8)
arel (>= 9.0) arel (>= 9.0)
activerecord-import (1.1.0) activerecord-import (1.4.0)
activerecord (>= 3.2) activerecord (>= 4.2)
activestorage (5.2.7.1) activestorage (5.2.8)
actionpack (= 5.2.7.1) actionpack (= 5.2.8)
activerecord (= 5.2.7.1) activerecord (= 5.2.8)
marcel (~> 1.0.0) marcel (~> 1.0.0)
activesupport (5.2.7.1) activesupport (5.2.8)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2) i18n (>= 0.7, < 2)
minitest (~> 5.1) minitest (~> 5.1)
@ -61,7 +61,7 @@ GEM
capybara (~> 3.13, < 4) capybara (~> 3.13, < 4)
websocket-driver (>= 0.6.5) websocket-driver (>= 0.6.5)
arel (9.0.0) arel (9.0.0)
asset_sync (2.15.0) asset_sync (2.15.2)
activemodel (>= 4.1.0) activemodel (>= 4.1.0)
fog-core fog-core
mime-types (>= 2.99) mime-types (>= 2.99)
@ -70,9 +70,9 @@ GEM
attr_encrypted (3.1.0) attr_encrypted (3.1.0)
encryptor (~> 3.0.0) encryptor (~> 3.0.0)
attr_required (1.0.1) attr_required (1.0.1)
autoprefixer-rails (10.3.3.0) autoprefixer-rails (10.4.7.0)
execjs (~> 2) execjs (~> 2)
bcrypt (3.1.16) bcrypt (3.1.18)
bindata (2.4.10) bindata (2.4.10)
bootstrap-sass (3.4.1) bootstrap-sass (3.4.1)
autoprefixer-rails (>= 5.2.1) autoprefixer-rails (>= 5.2.1)
@ -161,11 +161,11 @@ GEM
cucumber-api-steps (0.14.0) cucumber-api-steps (0.14.0)
cucumber (>= 2.0.2) cucumber (>= 2.0.2)
jsonpath (>= 0.1.2) jsonpath (>= 0.1.2)
cucumber-core (10.1.0) cucumber-core (10.1.1)
cucumber-gherkin (~> 22.0, >= 22.0.0) cucumber-gherkin (~> 22.0, >= 22.0.0)
cucumber-messages (~> 17.1, >= 17.1.1) cucumber-messages (~> 17.1, >= 17.1.1)
cucumber-tag-expressions (~> 4.0, >= 4.0.2) cucumber-tag-expressions (~> 4.1, >= 4.1.0)
cucumber-create-meta (6.0.2) cucumber-create-meta (6.0.4)
cucumber-messages (~> 17.1, >= 17.1.1) cucumber-messages (~> 17.1, >= 17.1.1)
sys-uname (~> 1.2, >= 1.2.2) sys-uname (~> 1.2, >= 1.2.2)
cucumber-cucumber-expressions (14.0.0) cucumber-cucumber-expressions (14.0.0)
@ -174,34 +174,33 @@ GEM
cucumber-html-formatter (17.0.0) cucumber-html-formatter (17.0.0)
cucumber-messages (~> 17.1, >= 17.1.0) cucumber-messages (~> 17.1, >= 17.1.0)
cucumber-messages (17.1.1) cucumber-messages (17.1.1)
cucumber-rails (2.4.0) cucumber-rails (2.5.1)
capybara (>= 2.18, < 4) capybara (>= 2.18, < 4)
cucumber (>= 3.2, < 8) cucumber (>= 3.2, < 8)
mime-types (~> 3.3) mime-types (~> 3.3)
nokogiri (~> 1.10) nokogiri (~> 1.10)
railties (>= 5.0, < 7) railties (>= 5.0, < 8)
rexml (~> 3.0) rexml (~> 3.0)
webrick (~> 1.7) webrick (~> 1.7)
cucumber-tag-expressions (4.1.0) cucumber-tag-expressions (4.1.0)
cucumber-wire (6.2.0) cucumber-wire (6.2.1)
cucumber-core (~> 10.1, >= 10.1.0) cucumber-core (~> 10.1, >= 10.1.0)
cucumber-cucumber-expressions (~> 14.0, >= 14.0.0) cucumber-cucumber-expressions (~> 14.0, >= 14.0.0)
cucumber-messages (~> 17.1, >= 17.1.1)
database_cleaner-active_record (2.0.1) database_cleaner-active_record (2.0.1)
activerecord (>= 5.a) activerecord (>= 5.a)
database_cleaner-core (~> 2.0.0) database_cleaner-core (~> 2.0.0)
database_cleaner-core (2.0.1) database_cleaner-core (2.0.1)
devise (4.8.0) devise (4.8.1)
bcrypt (~> 3.0) bcrypt (~> 3.0)
orm_adapter (~> 0.1) orm_adapter (~> 0.1)
railties (>= 4.1.0) railties (>= 4.1.0)
responders responders
warden (~> 1.2.3) warden (~> 1.2.3)
devise-two-factor (4.0.1) devise-two-factor (4.0.2)
activesupport (< 6.2) activesupport (< 7.1)
attr_encrypted (>= 1.3, < 4, != 2) attr_encrypted (>= 1.3, < 4, != 2)
devise (~> 4.0) devise (~> 4.0)
railties (< 6.2) railties (< 7.1)
rotp (~> 6.0) rotp (~> 6.0)
devise_lastseenable (0.0.6) devise_lastseenable (0.0.6)
devise devise
@ -221,7 +220,7 @@ GEM
diaspora_federation (= 0.2.7) diaspora_federation (= 0.2.7)
fabrication (~> 2.16) fabrication (~> 2.16)
uuid (~> 2.3, >= 2.3.8) uuid (~> 2.3, >= 2.3.8)
diff-lcs (1.4.4) diff-lcs (1.5.0)
docile (1.4.0) docile (1.4.0)
domain_name (0.5.20190701) domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0) unf (>= 0.0.5, < 1.0.0)
@ -234,11 +233,11 @@ GEM
execjs execjs
multi_json (>= 1.3) multi_json (>= 1.3)
rake rake
et-orbi (1.2.6) et-orbi (1.2.7)
tzinfo tzinfo
ethon (0.15.0) ethon (0.15.0)
ffi (>= 1.15.0) ffi (>= 1.15.0)
excon (0.88.0) excon (0.92.3)
execjs (2.8.1) execjs (2.8.1)
eye (0.10.0) eye (0.10.0)
celluloid (~> 0.17.3) celluloid (~> 0.17.3)
@ -252,14 +251,14 @@ GEM
factory_girl_rails (4.9.0) factory_girl_rails (4.9.0)
factory_girl (~> 4.9.0) factory_girl (~> 4.9.0)
railties (>= 3.0.0) railties (>= 3.0.0)
faraday (0.17.4) faraday (0.17.5)
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
faraday-cookie_jar (0.0.7) faraday-cookie_jar (0.0.7)
faraday (>= 0.8.0) faraday (>= 0.8.0)
http-cookie (~> 1.0.0) http-cookie (~> 1.0.0)
faraday_middleware (0.14.0) faraday_middleware (0.14.0)
faraday (>= 0.7.4, < 1.0) faraday (>= 0.7.4, < 1.0)
ffi (1.15.4) ffi (1.15.5)
ffi-compiler (1.0.1) ffi-compiler (1.0.1)
ffi (>= 1.0.0) ffi (>= 1.0.0)
rake rake
@ -267,15 +266,14 @@ GEM
activerecord (>= 2) activerecord (>= 2)
activesupport (>= 2) activesupport (>= 2)
hashdiff hashdiff
fog-aws (3.12.0) fog-aws (3.14.0)
fog-core (~> 2.1) fog-core (~> 2.1)
fog-json (~> 1.1) fog-json (~> 1.1)
fog-xml (~> 0.1) fog-xml (~> 0.1)
ipaddress (~> 0.8) fog-core (2.3.0)
fog-core (2.2.4)
builder builder
excon (~> 0.71) excon (~> 0.71)
formatador (~> 0.2) formatador (>= 0.2, < 2.0)
mime-types mime-types
fog-json (1.2.0) fog-json (1.2.0)
fog-core fog-core
@ -283,18 +281,18 @@ GEM
fog-xml (0.1.4) fog-xml (0.1.4)
fog-core fog-core
nokogiri (>= 1.5.11, < 2.0.0) nokogiri (>= 1.5.11, < 2.0.0)
formatador (0.3.0) formatador (1.1.0)
fugit (1.5.2) fugit (1.5.3)
et-orbi (~> 1.1, >= 1.1.8) et-orbi (~> 1, >= 1.2.7)
raabro (~> 1.4) raabro (~> 1.4)
fuubar (2.5.1) fuubar (2.5.1)
rspec-core (~> 3.0) rspec-core (~> 3.0)
ruby-progressbar (~> 1.4) ruby-progressbar (~> 1.4)
get_process_mem (0.2.7) get_process_mem (0.2.7)
ffi (~> 1.0) ffi (~> 1.0)
gitlab (4.17.0) gitlab (4.18.0)
httparty (~> 0.18) httparty (~> 0.18)
terminal-table (~> 1.5, >= 1.5.1) terminal-table (>= 1.5.1)
globalid (1.0.0) globalid (1.0.0)
activesupport (>= 5.0) activesupport (>= 5.0)
gon (6.4.0) gon (6.4.0)
@ -305,13 +303,13 @@ GEM
haml (5.2.2) haml (5.2.2)
temple (>= 0.8.0) temple (>= 0.8.0)
tilt tilt
haml_lint (0.37.1) haml_lint (0.40.0)
haml (>= 4.0, < 5.3) haml (>= 4.0, < 5.3)
parallel (~> 1.10) parallel (~> 1.10)
rainbow rainbow
rubocop (>= 0.50.0) rubocop (>= 0.50.0)
sysexits (~> 1.1) sysexits (~> 1.1)
hamlit (2.15.1) hamlit (2.16.0)
temple (>= 0.8.2) temple (>= 0.8.2)
thor thor
tilt tilt
@ -320,13 +318,13 @@ GEM
sprockets (>= 2.0.0) sprockets (>= 2.0.0)
tilt (>= 1.2) tilt (>= 1.2)
hashdiff (1.0.1) hashdiff (1.0.1)
hashie (4.1.0) hashie (5.0.0)
http (4.4.1) http (4.4.1)
addressable (~> 2.3) addressable (~> 2.3)
http-cookie (~> 1.0) http-cookie (~> 1.0)
http-form_data (~> 2.2) http-form_data (~> 2.2)
http-parser (~> 1.2.0) http-parser (~> 1.2.0)
http-cookie (1.0.4) http-cookie (1.0.5)
domain_name (~> 0.5) domain_name (~> 0.5)
http-form_data (2.3.0) http-form_data (2.3.0)
http-parser (1.2.3) http-parser (1.2.3)
@ -345,10 +343,9 @@ GEM
actionpack (>= 3.0.0) actionpack (>= 3.0.0)
i18n-inflector (~> 2.6) i18n-inflector (~> 2.6)
railties (>= 3.0.0) railties (>= 3.0.0)
image_processing (1.12.1) image_processing (1.12.2)
mini_magick (>= 4.9.5, < 5) mini_magick (>= 4.9.5, < 5)
ruby-vips (>= 2.0.17, < 3) ruby-vips (>= 2.0.17, < 3)
ipaddress (0.8.3)
jasmine (3.10.0) jasmine (3.10.0)
jasmine-core (~> 3.10.0) jasmine-core (~> 3.10.0)
phantomjs phantomjs
@ -357,42 +354,39 @@ GEM
webrick webrick
jasmine-core (3.10.1) jasmine-core (3.10.1)
jasmine-jquery-rails (2.0.3) jasmine-jquery-rails (2.0.3)
jquery-rails (4.4.0) jquery-rails (4.5.0)
rails-dom-testing (>= 1, < 3) rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0) railties (>= 4.2.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
js-routes (2.1.2) js-routes (2.2.4)
railties (>= 4) railties (>= 4)
js_image_paths (0.1.1) js_image_paths (0.1.1)
rails (>= 4.0, < 6.0) rails (>= 4.0, < 6.0)
sprockets (>= 3.0.0) sprockets (>= 3.0.0)
json (2.3.0) json (2.6.2)
json-jwt (1.13.0) json-jwt (1.13.0)
activesupport (>= 4.2) activesupport (>= 4.2)
aes_key_wrap aes_key_wrap
bindata bindata
json-schema (2.8.1) json-schema (3.0.0)
addressable (>= 2.4) addressable (>= 2.8)
json-schema-rspec (0.0.4) jsonpath (1.1.2)
json-schema (~> 2.5)
rspec
jsonpath (1.1.0)
multi_json multi_json
jwt (2.3.0) jwt (2.4.1)
kgio (2.11.4) kgio (2.11.4)
kostya-sigar (2.0.10) kostya-sigar (2.0.10)
leaflet-rails (1.7.0) leaflet-rails (1.7.0)
rails (>= 4.2.0) rails (>= 4.2.0)
listen (3.5.1) listen (3.7.1)
rb-fsevent (~> 0.10, >= 0.10.3) rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10) rb-inotify (~> 0.9, >= 0.9.10)
little-plugger (1.1.4) little-plugger (1.1.4)
logging (2.3.0) logging (2.3.1)
little-plugger (~> 1.1) little-plugger (~> 1.1)
multi_json (~> 1.14) multi_json (~> 1.14)
logging-rails (0.6.0) logging-rails (0.6.0)
logging (>= 1.8) logging (>= 1.8)
loofah (2.16.0) loofah (2.18.0)
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
macaddr (1.7.2) macaddr (1.7.2)
@ -405,9 +399,9 @@ GEM
memoizable (0.4.2) memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1) thread_safe (~> 0.3, >= 0.3.1)
method_source (1.0.0) method_source (1.0.0)
mime-types (3.3.1) mime-types (3.4.1)
mime-types-data (~> 3.2015) mime-types-data (~> 3.2015)
mime-types-data (3.2021.0901) mime-types-data (3.2022.0105)
mini_magick (4.11.0) mini_magick (4.11.0)
mini_mime (1.1.2) mini_mime (1.1.2)
mini_portile2 (2.6.1) mini_portile2 (2.6.1)
@ -418,34 +412,35 @@ GEM
multi_json (1.15.0) multi_json (1.15.0)
multi_test (0.1.2) multi_test (0.1.2)
multi_xml (0.6.0) multi_xml (0.6.0)
multipart-post (2.1.1) multipart-post (2.2.3)
mysql2 (0.5.3) mysql2 (0.5.4)
naught (1.1.0) naught (1.1.0)
nio4r (2.5.8) nio4r (2.5.8)
nokogiri (1.12.5) nokogiri (1.12.5)
mini_portile2 (~> 2.6.1) mini_portile2 (~> 2.6.1)
racc (~> 1.4) racc (~> 1.4)
oauth (0.5.7) oauth (0.5.10)
oauth2 (1.4.7) oauth2 (2.0.2)
faraday (>= 0.8, < 2.0) faraday (>= 0.17.3, < 3.0)
jwt (>= 1.0, < 3.0) jwt (>= 1.0, < 3.0)
multi_json (~> 1.3)
multi_xml (~> 0.5) multi_xml (~> 0.5)
rack (>= 1.2, < 3) rack (>= 1.2, < 3)
octokit (4.21.0) rash_alt (>= 0.4, < 1)
version_gem (~> 1.0)
octokit (4.22.0)
faraday (>= 0.9) faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3) sawyer (~> 0.8.0, >= 0.5.3)
omniauth (2.0.4) omniauth (2.1.0)
hashie (>= 3.4.6) hashie (>= 3.4.6)
rack (>= 1.6.2, < 3) rack (>= 2.2.3)
rack-protection rack-protection
omniauth-oauth (1.2.0) omniauth-oauth (1.2.0)
oauth oauth
omniauth (>= 1.0, < 3) omniauth (>= 1.0, < 3)
omniauth-oauth2 (1.7.2) omniauth-oauth2 (1.8.0)
oauth2 (~> 1.4) oauth2 (>= 1.4, < 3)
omniauth (>= 1.9, < 3) omniauth (~> 2.0)
omniauth-rails_csrf_protection (1.0.0) omniauth-rails_csrf_protection (1.0.1)
actionpack (>= 4.2) actionpack (>= 4.2)
omniauth (~> 2.0) omniauth (~> 2.0)
omniauth-tumblr (1.2) omniauth-tumblr (1.2)
@ -470,10 +465,10 @@ GEM
validate_url validate_url
webfinger (>= 1.0.1) webfinger (>= 1.0.1)
orm_adapter (0.5.0) orm_adapter (0.5.0)
parallel (1.21.0) parallel (1.22.1)
parser (3.0.2.0) parser (3.1.2.0)
ast (~> 2.4.1) ast (~> 2.4.1)
pg (1.2.3) pg (1.4.1)
phantomjs (2.1.1.0) phantomjs (2.1.1.0)
pronto (0.11.0) pronto (0.11.0)
gitlab (~> 4.4, >= 4.4.0) gitlab (~> 4.4, >= 4.4.0)
@ -486,10 +481,9 @@ GEM
pronto-eslint (0.11.0) pronto-eslint (0.11.0)
eslintrb (~> 2.0, >= 2.0.0) eslintrb (~> 2.0, >= 2.0.0)
pronto (~> 0.11.0) pronto (~> 0.11.0)
pronto-haml (0.11.0) pronto-haml (0.11.1)
haml_lint (~> 0.23) haml_lint (~> 0.23)
pronto (~> 0.11.0) pronto (~> 0.11.0)
rubocop (< 1.0)
pronto-rubocop (0.11.1) pronto-rubocop (0.11.1)
pronto (~> 0.11.0) pronto (~> 0.11.0)
rubocop (>= 0.63.1, < 2.0) rubocop (>= 0.63.1, < 2.0)
@ -502,10 +496,10 @@ GEM
pry-byebug (3.8.0) pry-byebug (3.8.0)
byebug (~> 11.0) byebug (~> 11.0)
pry (~> 0.10) pry (~> 0.10)
public_suffix (4.0.6) public_suffix (4.0.7)
raabro (1.4.0) raabro (1.4.0)
racc (1.6.0) racc (1.6.0)
rack (2.2.3) rack (2.2.3.1)
rack-cors (1.1.1) rack-cors (1.1.1)
rack (>= 2.0.0) rack (>= 2.0.0)
rack-google-analytics (1.2.0) rack-google-analytics (1.2.0)
@ -520,25 +514,25 @@ GEM
json-jwt (>= 1.11.0) json-jwt (>= 1.11.0)
rack (>= 2.1.0) rack (>= 2.1.0)
rack-piwik (0.3.0) rack-piwik (0.3.0)
rack-protection (2.1.0) rack-protection (2.2.0)
rack rack
rack-rewrite (1.5.1) rack-rewrite (1.5.1)
rack-ssl (1.4.1) rack-ssl (1.4.1)
rack rack
rack-test (1.1.0) rack-test (2.0.0)
rack (>= 1.0, < 3) rack (>= 1.3)
rails (5.2.7.1) rails (5.2.8)
actioncable (= 5.2.7.1) actioncable (= 5.2.8)
actionmailer (= 5.2.7.1) actionmailer (= 5.2.8)
actionpack (= 5.2.7.1) actionpack (= 5.2.8)
actionview (= 5.2.7.1) actionview (= 5.2.8)
activejob (= 5.2.7.1) activejob (= 5.2.8)
activemodel (= 5.2.7.1) activemodel (= 5.2.8)
activerecord (= 5.2.7.1) activerecord (= 5.2.8)
activestorage (= 5.2.7.1) activestorage (= 5.2.8)
activesupport (= 5.2.7.1) activesupport (= 5.2.8)
bundler (>= 1.3.0) bundler (>= 1.3.0)
railties (= 5.2.7.1) railties (= 5.2.8)
sprockets-rails (>= 2.0.0) sprockets-rails (>= 2.0.0)
rails-assets-autosize (4.0.2) rails-assets-autosize (4.0.2)
rails-assets-backbone (1.3.3) rails-assets-backbone (1.3.3)
@ -564,7 +558,7 @@ GEM
rails-assets-jasmine (3.4.0) rails-assets-jasmine (3.4.0)
rails-assets-jasmine-ajax (4.0.0) rails-assets-jasmine-ajax (4.0.0)
rails-assets-jasmine (~> 3) rails-assets-jasmine (~> 3)
rails-assets-jquery (3.5.1) rails-assets-jquery (3.6.0)
rails-assets-jquery-colorbox (1.6.4) rails-assets-jquery-colorbox (1.6.4)
rails-assets-jquery (>= 1.3.2) rails-assets-jquery (>= 1.3.2)
rails-assets-jquery-fullscreen-plugin (0.5.0) rails-assets-jquery-fullscreen-plugin (0.5.0)
@ -594,54 +588,52 @@ GEM
rails-dom-testing (2.0.3) rails-dom-testing (2.0.3)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
nokogiri (>= 1.6) nokogiri (>= 1.6)
rails-html-sanitizer (1.4.2) rails-html-sanitizer (1.4.3)
loofah (~> 2.3) loofah (~> 2.3)
rails-i18n (5.1.3) rails-i18n (5.1.3)
i18n (>= 0.7, < 2) i18n (>= 0.7, < 2)
railties (>= 5.0, < 6) railties (>= 5.0, < 6)
rails-timeago (2.19.1) rails-timeago (2.20.0)
actionpack (>= 3.1) actionpack (>= 5.2)
activesupport (>= 3.1) activesupport (>= 5.2)
railties (5.2.7.1) railties (5.2.8)
actionpack (= 5.2.7.1) actionpack (= 5.2.8)
activesupport (= 5.2.7.1) activesupport (= 5.2.8)
method_source method_source
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0) thor (>= 0.19.0, < 2.0)
rainbow (3.0.0) rainbow (3.1.1)
raindrops (0.19.2) raindrops (0.20.0)
rake (12.3.3) rake (12.3.3)
rb-fsevent (0.11.0) rash_alt (0.4.12)
hashie (>= 3.4)
rb-fsevent (0.11.1)
rb-inotify (0.10.1) rb-inotify (0.10.1)
ffi (~> 1.0) ffi (~> 1.0)
redcarpet (3.5.1) redcarpet (3.5.1)
redis (4.5.1) redis (4.7.0)
regexp_parser (2.1.1) regexp_parser (2.5.0)
request_store (1.5.0) request_store (1.5.1)
rack (>= 1.4) rack (>= 1.4)
responders (3.0.1) responders (3.0.1)
actionpack (>= 5.0) actionpack (>= 5.0)
railties (>= 5.0) railties (>= 5.0)
rexml (3.2.5) rexml (3.2.5)
rotp (6.2.0) rotp (6.2.0)
rqrcode (2.1.0) rqrcode (2.1.1)
chunky_png (~> 1.0) chunky_png (~> 1.0)
rqrcode_core (~> 1.0) rqrcode_core (~> 1.0)
rqrcode_core (1.2.0) rqrcode_core (1.2.0)
rspec (3.10.0) rspec-core (3.11.0)
rspec-core (~> 3.10.0) rspec-support (~> 3.11.0)
rspec-expectations (~> 3.10.0) rspec-expectations (3.11.0)
rspec-mocks (~> 3.10.0)
rspec-core (3.10.1)
rspec-support (~> 3.10.0)
rspec-expectations (3.10.1)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.10.0) rspec-support (~> 3.11.0)
rspec-json_expectations (2.2.0) rspec-json_expectations (2.2.0)
rspec-mocks (3.10.2) rspec-mocks (3.11.1)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.10.0) rspec-support (~> 3.11.0)
rspec-rails (5.0.2) rspec-rails (5.1.2)
actionpack (>= 5.2) actionpack (>= 5.2)
activesupport (>= 5.2) activesupport (>= 5.2)
railties (>= 5.2) railties (>= 5.2)
@ -649,7 +641,7 @@ GEM
rspec-expectations (~> 3.10) rspec-expectations (~> 3.10)
rspec-mocks (~> 3.10) rspec-mocks (~> 3.10)
rspec-support (~> 3.10) rspec-support (~> 3.10)
rspec-support (3.10.3) rspec-support (3.11.0)
rubocop (0.93.1) rubocop (0.93.1)
parallel (~> 1.10) parallel (~> 1.10)
parser (>= 2.7.1.5) parser (>= 2.7.1.5)
@ -659,15 +651,15 @@ GEM
rubocop-ast (>= 0.6.0) rubocop-ast (>= 0.6.0)
ruby-progressbar (~> 1.7) ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0) unicode-display_width (>= 1.4.0, < 2.0)
rubocop-ast (1.7.0) rubocop-ast (1.17.0)
parser (>= 3.0.1.1) parser (>= 3.1.1.0)
rubocop-rails (2.9.1) rubocop-rails (2.9.1)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
rack (>= 1.1) rack (>= 1.1)
rubocop (>= 0.90.0, < 2.0) rubocop (>= 0.90.0, < 2.0)
ruby-oembed (0.15.0) ruby-oembed (0.16.1)
ruby-progressbar (1.11.0) ruby-progressbar (1.11.0)
ruby-vips (2.1.3) ruby-vips (2.1.4)
ffi (~> 1.12) ffi (~> 1.12)
rubyzip (2.3.2) rubyzip (2.3.2)
rugged (1.0.1) rugged (1.0.1)
@ -689,12 +681,12 @@ GEM
secure_headers (6.3.3) secure_headers (6.3.3)
shoulda-matchers (4.5.1) shoulda-matchers (4.5.1)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
sidekiq (6.2.2) sidekiq (6.4.2)
connection_pool (>= 2.2.2) connection_pool (>= 2.2.2)
rack (~> 2.0) rack (~> 2.0)
redis (>= 4.2.0) redis (>= 4.2.0)
sidekiq-cron (1.2.0) sidekiq-cron (1.4.0)
fugit (~> 1.1) fugit (~> 1)
sidekiq (>= 4.2.1) sidekiq (>= 4.2.1)
simple_captcha2 (0.5.0) simple_captcha2 (0.5.0)
rails (>= 4.1) rails (>= 4.1)
@ -704,15 +696,15 @@ GEM
simplecov-html (~> 0.11) simplecov-html (~> 0.11)
simplecov_json_formatter (~> 0.1) simplecov_json_formatter (~> 0.1)
simplecov-html (0.12.3) simplecov-html (0.12.3)
simplecov_json_formatter (0.1.3) simplecov_json_formatter (0.1.4)
sinon-rails (1.15.0) sinon-rails (1.15.0)
railties (>= 3.1) railties (>= 3.1)
sprockets (3.7.2) sprockets (3.7.2)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
rack (> 1, < 3) rack (> 1, < 3)
sprockets-rails (3.2.2) sprockets-rails (3.4.2)
actionpack (>= 4.0) actionpack (>= 5.2)
activesupport (>= 4.0) activesupport (>= 5.2)
sprockets (>= 3.0.0) sprockets (>= 3.0.0)
ssrf_filter (1.0.7) ssrf_filter (1.0.7)
state_machines (0.5.0) state_machines (0.5.0)
@ -726,16 +718,16 @@ GEM
sysexits (1.2.0) sysexits (1.2.0)
systemu (2.6.5) systemu (2.6.5)
temple (0.8.2) temple (0.8.2)
terminal-table (1.8.0) terminal-table (3.0.2)
unicode-display_width (~> 1.1, >= 1.1.1) unicode-display_width (>= 1.1.1, < 3)
terser (1.1.7) terser (1.1.10)
execjs (>= 0.3.0, < 3) execjs (>= 0.3.0, < 3)
thor (1.2.1) thor (1.2.1)
thread_safe (0.3.6) thread_safe (0.3.6)
tilt (2.0.10) tilt (2.0.10)
timecop (0.9.4) timecop (0.9.5)
timers (4.3.3) timers (4.3.3)
toml-rb (2.1.0) toml-rb (2.1.2)
citrus (~> 3.0, > 3.0) citrus (~> 3.0, > 3.0)
turbo_dev_assets (0.0.2) turbo_dev_assets (0.0.2)
twitter (7.0.0) twitter (7.0.0)
@ -757,9 +749,9 @@ GEM
thread_safe (~> 0.1) thread_safe (~> 0.1)
unf (0.1.4) unf (0.1.4)
unf_ext unf_ext
unf_ext (0.0.8) unf_ext (0.0.8.2)
unicode-display_width (1.8.0) unicode-display_width (1.8.0)
unicorn (6.0.0) unicorn (6.1.0)
kgio (~> 2.6) kgio (~> 2.6)
raindrops (~> 0.7) raindrops (~> 0.7)
unicorn-worker-killer (0.4.5) unicorn-worker-killer (0.4.5)
@ -771,9 +763,10 @@ GEM
validate_email (0.1.6) validate_email (0.1.6)
activemodel (>= 3.0) activemodel (>= 3.0)
mail (>= 2.2.5) mail (>= 2.2.5)
validate_url (1.0.13) validate_url (1.0.15)
activemodel (>= 3.0.0) activemodel (>= 3.0.0)
public_suffix public_suffix
version_gem (1.1.0)
versionist (2.0.1) versionist (2.0.1)
activesupport (>= 3) activesupport (>= 3)
railties (>= 3) railties (>= 3)
@ -794,20 +787,21 @@ GEM
will_paginate (3.3.1) will_paginate (3.3.1)
xpath (3.2.0) xpath (3.2.0)
nokogiri (~> 1.8) nokogiri (~> 1.8)
yard (0.9.26) yard (0.9.28)
webrick (~> 1.7.0)
PLATFORMS PLATFORMS
ruby ruby
DEPENDENCIES DEPENDENCIES
active_model_serializers (= 0.9.7) active_model_serializers (= 0.9.8)
activerecord-import (= 1.1.0) activerecord-import (= 1.4.0)
acts-as-taggable-on (= 8.1.0) acts-as-taggable-on (= 8.1.0)
acts_as_api (= 1.0.1) acts_as_api (= 1.0.1)
addressable (= 2.8.0) addressable (= 2.8.0)
apparition (= 0.6.0) apparition (= 0.6.0)
asset_sync (= 2.15.0) asset_sync (= 2.15.2)
autoprefixer-rails (= 10.3.3.0) autoprefixer-rails (= 10.4.7.0)
bootstrap-sass (= 3.4.1) bootstrap-sass (= 3.4.1)
bootstrap-switch-rails (= 3.3.3) bootstrap-switch-rails (= 3.3.3)
capybara (= 3.35.3) capybara (= 3.35.3)
@ -816,10 +810,10 @@ DEPENDENCIES
compass-rails (= 3.1.0) compass-rails (= 3.1.0)
configurate (= 0.5.0) configurate (= 0.5.0)
cucumber-api-steps (= 0.14) cucumber-api-steps (= 0.14)
cucumber-rails (= 2.4.0) cucumber-rails (= 2.5.1)
database_cleaner-active_record (= 2.0.1) database_cleaner-active_record (= 2.0.1)
devise (= 4.8.0) devise (= 4.8.1)
devise-two-factor (= 4.0.1) devise-two-factor (= 4.0.2)
devise_lastseenable (= 0.0.6) devise_lastseenable (= 0.0.6)
diaspora-prosody-config (= 0.0.7) diaspora-prosody-config (= 0.0.7)
diaspora_federation-json_schema (= 0.2.7) diaspora_federation-json_schema (= 0.2.7)
@ -828,47 +822,46 @@ DEPENDENCIES
entypo-rails (= 3.0.0) entypo-rails (= 3.0.0)
eye (= 0.10.0) eye (= 0.10.0)
factory_girl_rails (= 4.9.0) factory_girl_rails (= 4.9.0)
faraday (= 0.17.4) faraday (= 0.17.5)
faraday-cookie_jar (= 0.0.7) faraday-cookie_jar (= 0.0.7)
faraday_middleware (= 0.14.0) faraday_middleware (= 0.14.0)
fixture_builder (= 0.5.2) fixture_builder (= 0.5.2)
fog-aws (= 3.12.0) fog-aws (= 3.14.0)
fuubar (= 2.5.1) fuubar (= 2.5.1)
gon (= 6.4.0) gon (= 6.4.0)
haml_lint (= 0.37.1) haml_lint (= 0.40.0)
hamlit (= 2.15.1) hamlit (= 2.16.0)
handlebars_assets (= 0.23.9) handlebars_assets (= 0.23.9)
http_accept_language (= 2.1.1) http_accept_language (= 2.1.1)
i18n-inflector-rails (= 1.0.7) i18n-inflector-rails (= 1.0.7)
jasmine (= 3.10.0) jasmine (= 3.10.0)
jasmine-jquery-rails (= 2.0.3) jasmine-jquery-rails (= 2.0.3)
jquery-rails (= 4.4.0) jquery-rails (= 4.5.0)
js-routes (= 2.1.2) js-routes (= 2.2.4)
js_image_paths (= 0.1.1) js_image_paths (= 0.1.1)
json (= 2.3.0) json (= 2.6.2)
json-schema (= 2.8.1) json-schema (= 3.0.0)
json-schema-rspec (= 0.0.4)
leaflet-rails (= 1.7.0) leaflet-rails (= 1.7.0)
listen (= 3.5.1) listen (= 3.7.1)
logging-rails (= 0.6.0) logging-rails (= 0.6.0)
markdown-it-html5-embed (= 1.0.0) markdown-it-html5-embed (= 1.0.0)
markerb (= 1.1.0) markerb (= 1.1.0)
mini_magick (= 4.11.0) mini_magick (= 4.11.0)
minitest minitest (= 5.15.0)
mobile-fu (= 1.4.0) mobile-fu (= 1.4.0)
mysql2 (= 0.5.3) mysql2 (= 0.5.4)
nokogiri (= 1.12.5) nokogiri (= 1.12.5)
omniauth (= 2.0.4) omniauth (= 2.1.0)
omniauth-rails_csrf_protection (= 1.0.0) omniauth-rails_csrf_protection (= 1.0.1)
omniauth-tumblr (= 1.2) omniauth-tumblr (= 1.2)
omniauth-twitter (= 1.4.0) omniauth-twitter (= 1.4.0)
omniauth-wordpress (= 0.2.2) omniauth-wordpress (= 0.2.2)
open_graph_reader (= 0.7.2) open_graph_reader (= 0.7.2)
openid_connect (= 1.3.0) openid_connect (= 1.3.0)
pg (= 1.2.3) pg (= 1.4.1)
pronto (= 0.11.0) pronto (= 0.11.0)
pronto-eslint (= 0.11.0) pronto-eslint (= 0.11.0)
pronto-haml (= 0.11.0) pronto-haml (= 0.11.1)
pronto-rubocop (= 0.11.1) pronto-rubocop (= 0.11.1)
pronto-scss (= 0.11.0) pronto-scss (= 0.11.0)
pry pry
@ -878,17 +871,18 @@ DEPENDENCIES
rack-piwik (= 0.3.0) rack-piwik (= 0.3.0)
rack-rewrite (= 1.5.1) rack-rewrite (= 1.5.1)
rack-ssl (= 1.4.1) rack-ssl (= 1.4.1)
rails (= 5.2.7.1) rails (= 5.2.8)
rails-assets-autosize (= 4.0.2)! rails-assets-autosize (= 4.0.2)!
rails-assets-backbone (= 1.3.3)! rails-assets-backbone (= 1.3.3)!
rails-assets-blueimp-gallery (= 2.33.0)! rails-assets-blueimp-gallery (= 2.33.0)!
rails-assets-bootstrap (= 3.4.1)!
rails-assets-bootstrap-markdown (= 2.10.0)! rails-assets-bootstrap-markdown (= 2.10.0)!
rails-assets-corejs-typeahead (= 1.2.1)! rails-assets-corejs-typeahead (= 1.2.1)!
rails-assets-diaspora_jsxc (= 0.1.5.develop.7)! rails-assets-diaspora_jsxc (= 0.1.5.develop.7)!
rails-assets-fine-uploader (= 5.13.0)! rails-assets-fine-uploader (= 5.13.0)!
rails-assets-highlightjs (= 9.12.0)! rails-assets-highlightjs (= 9.12.0)!
rails-assets-jasmine-ajax (= 4.0.0)! rails-assets-jasmine-ajax (= 4.0.0)!
rails-assets-jquery (= 3.5.1)! rails-assets-jquery (= 3.6.0)!
rails-assets-jquery-placeholder (= 2.3.1)! rails-assets-jquery-placeholder (= 2.3.1)!
rails-assets-jquery-textchange (= 0.2.3)! rails-assets-jquery-textchange (= 0.2.3)!
rails-assets-jquery.are-you-sure (= 1.9.0)! rails-assets-jquery.are-you-sure (= 1.9.0)!
@ -904,35 +898,35 @@ DEPENDENCIES
rails-assets-utatti-perfect-scrollbar (= 1.4.0)! rails-assets-utatti-perfect-scrollbar (= 1.4.0)!
rails-controller-testing (= 1.0.5) rails-controller-testing (= 1.0.5)
rails-i18n (= 5.1.3) rails-i18n (= 5.1.3)
rails-timeago (= 2.19.1) rails-timeago (= 2.20.0)
redcarpet (= 3.5.1) redcarpet (= 3.5.1)
redis (= 4.5.1) redis (= 4.7.0)
responders (= 3.0.1) responders (= 3.0.1)
rqrcode (= 2.1.0) rqrcode (= 2.1.1)
rspec-json_expectations (~> 2.1) rspec-json_expectations (~> 2.1)
rspec-rails (= 5.0.2) rspec-rails (= 5.1.2)
rubocop (= 0.93.1) rubocop (= 0.93.1)
rubocop-rails (= 2.9.1) rubocop-rails (= 2.9.1)
ruby-oembed (= 0.15.0) ruby-oembed (= 0.16.1)
rubyzip (= 2.3.2) rubyzip (= 2.3.2)
sass-rails (= 5.0.7) sass-rails (= 5.0.7)
secure_headers (= 6.3.3) secure_headers (= 6.3.3)
shoulda-matchers (= 4.5.1) shoulda-matchers (= 4.5.1)
sidekiq (= 6.2.2) sidekiq (= 6.4.2)
sidekiq-cron (= 1.2.0) sidekiq-cron (= 1.4.0)
simple_captcha2 (= 0.5.0) simple_captcha2 (= 0.5.0)
simplecov (= 0.21.2) simplecov (= 0.21.2)
sinon-rails (= 1.15.0) sinon-rails (= 1.15.0)
sprockets-rails (= 3.2.2) sprockets-rails (= 3.4.2)
string-direction (= 1.2.2) string-direction (= 1.2.2)
terser (= 1.1.7) terser (= 1.1.10)
timecop (= 0.9.4) timecop (= 0.9.5)
toml-rb (= 2.1.0) toml-rb (= 2.1.2)
turbo_dev_assets (= 0.0.2) turbo_dev_assets (= 0.0.2)
twitter (= 7.0.0) twitter (= 7.0.0)
twitter-text (= 1.14.7) twitter-text (= 1.14.7)
typhoeus (= 1.4.0) typhoeus (= 1.4.0)
unicorn (= 6.0.0) unicorn (= 6.1.0)
unicorn-worker-killer (= 0.4.5) unicorn-worker-killer (= 0.4.5)
uuid (= 2.3.9) uuid (= 2.3.9)
versionist (= 2.0.1) versionist (= 2.0.1)

2
config/sidekiq.yml
View file

@ -1,4 +1,4 @@
<% require_relative 'config/load_config' %> <% require_relative 'load_config' %>
--- ---
:verbose: false :verbose: false
<% unless AppConfig.heroku? %> <% unless AppConfig.heroku? %>

3
spec/integration/exporter_spec.rb
View file

@ -16,7 +16,8 @@ describe Diaspora::Exporter do
%i[generic_user_data activity status_messages_flavours work_aspect] %i[generic_user_data activity status_messages_flavours work_aspect]
) )
expect(JSON.parse(json)).to match_json_schema(:archive_schema) errors = JSON::Validator.fully_validate("lib/schemas/archive-format.json", JSON.parse(json))
expect(errors).to be_empty
end end
it "contains basic user data" do it "contains basic user data" do

3
spec/spec_helper.rb
View file

@ -133,9 +133,6 @@ RSpec.configure do |config|
config.include FactoryGirl::Syntax::Methods config.include FactoryGirl::Syntax::Methods
config.include JSON::SchemaMatchers
config.json_schemas[:archive_schema] = "lib/schemas/archive-format.json"
JSON::Validator.add_schema( JSON::Validator.add_schema(
JSON::Schema.new( JSON::Schema.new(
DiasporaFederation::Schemas.federation_entities, DiasporaFederation::Schemas.federation_entities,