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

Merge branch 'next-minor' into develop

Browse source
This commit is contained in:
Benjamin Neff 2018-11-17 21:08:23 +01:00
commit b30c4e4e97
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
5 changed files with 223 additions and 225 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
Gemfile
View file

@ -10,7 +10,7 @@ gem "responders", "2.4.0"
# Appserver # Appserver
gem "unicorn", "5.4.0", require: false gem "unicorn", "5.4.1", require: false
gem "unicorn-worker-killer", "0.4.4" gem "unicorn-worker-killer", "0.4.4"
# Federation # Federation
@ -22,11 +22,11 @@ gem "diaspora_federation-rails", "0.2.5"
gem "acts_as_api", "1.0.1" gem "acts_as_api", "1.0.1"
gem "json", "2.1.0" gem "json", "2.1.0"
gem "json-schema", "2.8.0" gem "json-schema", "2.8.1"
# Authentication # Authentication
gem "devise", "4.4.3" gem "devise", "4.5.0"
gem "devise_lastseenable", "0.0.6" gem "devise_lastseenable", "0.0.6"
# Captcha # Captcha
@ -36,15 +36,15 @@ gem "simple_captcha2", "0.4.3", require: "simple_captcha"
# Background processing # Background processing
gem "redis", "3.3.5" # Pinned to 3.3.x because of https://github.com/antirez/redis/issues/4272 gem "redis", "3.3.5" # Pinned to 3.3.x because of https://github.com/antirez/redis/issues/4272
gem "sidekiq", "5.1.3" gem "sidekiq", "5.2.3"
# Scheduled processing # Scheduled processing
gem "sidekiq-cron", "0.6.3" gem "sidekiq-cron", "1.0.4"
# Compression # Compression
gem "uglifier", "4.1.8" gem "uglifier", "4.1.19"
# Configuration # Configuration
@ -56,33 +56,33 @@ gem "rack-cors", "1.0.2", require: "rack/cors"
# CSS # CSS
gem "autoprefixer-rails", "8.2.0" gem "autoprefixer-rails", "8.6.5"
gem "bootstrap-sass", "3.3.7" gem "bootstrap-sass", "3.3.7"
gem "bootstrap-switch-rails", "3.3.3" gem "bootstrap-switch-rails", "3.3.4"
gem "compass-rails", "3.0.2" gem "compass-rails", "3.1.0"
gem "sass-rails", "5.0.7" gem "sass-rails", "5.0.7"
gem "sprockets-rails", "3.2.1" gem "sprockets-rails", "3.2.1"
# Database # Database
group :mysql, optional: true do group :mysql, optional: true do
gem "mysql2", "0.5.0" gem "mysql2", "0.5.2"
end end
group :postgresql, optional: true do group :postgresql, optional: true do
gem "pg", "1.0.0" gem "pg", "1.1.3"
end end
gem "activerecord-import", "0.22.0" gem "activerecord-import", "0.27.0"
# File uploading # File uploading
gem "carrierwave", "1.2.2" gem "carrierwave", "1.2.3"
gem "fog-aws", "2.0.1" gem "fog-aws", "3.3.0"
gem "mini_magick", "4.8.0" gem "mini_magick", "4.9.2"
# GUID generation # GUID generation
gem "uuid", "2.3.8" gem "uuid", "2.3.9"
# Icons # Icons
@ -92,16 +92,16 @@ gem "entypo-rails", "3.0.0"
gem "sprockets-es6", "0.9.2" gem "sprockets-es6", "0.9.2"
gem "handlebars_assets", "0.23.2" gem "handlebars_assets", "0.23.2"
gem "jquery-rails", "4.3.1" gem "jquery-rails", "4.3.3"
gem "js-routes", "1.4.3" gem "js-routes", "1.4.4"
gem "js_image_paths", "0.1.1" gem "js_image_paths", "0.1.1"
source "https://rails-assets.org" do source "https://rails-assets.org" do
gem "rails-assets-jquery", "3.2.1" # Should be kept in sync with jquery-rails gem "rails-assets-jquery", "3.3.1" # 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"
gem "rails-assets-markdown-it", "8.4.1" gem "rails-assets-markdown-it", "8.4.2"
gem "rails-assets-markdown-it-hashtag", "0.4.0" gem "rails-assets-markdown-it-hashtag", "0.4.0"
gem "rails-assets-markdown-it-diaspora-mention", "1.2.0" gem "rails-assets-markdown-it-diaspora-mention", "1.2.0"
gem "rails-assets-markdown-it-sanitizer", "0.4.3" gem "rails-assets-markdown-it-sanitizer", "0.4.3"
@ -118,12 +118,12 @@ source "https://rails-assets.org" do
# jQuery plugins # jQuery plugins
gem "rails-assets-autosize", "4.0.1" gem "rails-assets-autosize", "4.0.2"
gem "rails-assets-blueimp-gallery", "2.33.0" gem "rails-assets-blueimp-gallery", "2.33.0"
gem "rails-assets-jquery.are-you-sure", "1.9.0" gem "rails-assets-jquery.are-you-sure", "1.9.0"
gem "rails-assets-jquery-placeholder", "2.3.1" gem "rails-assets-jquery-placeholder", "2.3.1"
gem "rails-assets-jquery-textchange", "0.2.3" gem "rails-assets-jquery-textchange", "0.2.3"
gem "rails-assets-utatti-perfect-scrollbar", "1.3.0" gem "rails-assets-utatti-perfect-scrollbar", "1.4.0"
end end
gem "markdown-it-html5-embed", "1.0.0" gem "markdown-it-html5-embed", "1.0.0"
@ -132,7 +132,7 @@ gem "markdown-it-html5-embed", "1.0.0"
gem "http_accept_language", "2.1.1" gem "http_accept_language", "2.1.1"
gem "i18n-inflector-rails", "1.0.7" gem "i18n-inflector-rails", "1.0.7"
gem "rails-i18n", "5.1.1" gem "rails-i18n", "5.1.2"
# Mail # Mail
@ -155,7 +155,7 @@ gem "string-direction", "1.2.1"
# Security Headers # Security Headers
gem "secure_headers", "5.0.5" gem "secure_headers", "6.0.0"
# Services # Services
@ -178,20 +178,20 @@ gem "rails-assets-diaspora_jsxc", "0.1.5.develop.7", source: "https://rails-asse
# Tags # Tags
gem "acts-as-taggable-on", "5.0.0" gem "acts-as-taggable-on", "6.0.0"
# URIs and HTTP # URIs and HTTP
gem "addressable", "2.5.2", require: "addressable/uri" gem "addressable", "2.5.2", require: "addressable/uri"
gem "faraday", "0.12.2" # also update User-Agent in OpenID specs gem "faraday", "0.15.3"
gem "faraday_middleware", "0.12.2" gem "faraday_middleware", "0.12.2"
gem "faraday-cookie_jar", "0.0.6" gem "faraday-cookie_jar", "0.0.6"
gem "typhoeus", "1.3.0" gem "typhoeus", "1.3.1"
# Views # Views
gem "gon", "6.2.0" gem "gon", "6.2.1"
gem "hamlit", "2.8.8" gem "hamlit", "2.9.1"
gem "mobile-fu", "1.4.0" gem "mobile-fu", "1.4.0"
gem "rails-timeago", "2.16.0" gem "rails-timeago", "2.16.0"
gem "will_paginate", "3.1.6" gem "will_paginate", "3.1.6"
@ -237,12 +237,12 @@ 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.4.0", require: false gem "asset_sync", "2.5.0", require: false
end end
group :development do group :development do
# Automatic test runs # Automatic test runs
gem "guard", "2.14.2", require: false gem "guard", "2.15.0", require: false
gem "guard-cucumber", "2.1.2", require: false gem "guard-cucumber", "2.1.2", require: false
gem "guard-rspec", "4.7.3", require: false gem "guard-rspec", "4.7.3", require: false
gem "guard-rubocop", "1.3.0", require: false gem "guard-rubocop", "1.3.0", require: false
@ -250,13 +250,13 @@ group :development do
gem "rb-inotify", "0.9.10", require: false gem "rb-inotify", "0.9.10", require: false
# Linters # Linters
gem "haml_lint", "0.27.0", require: false gem "haml_lint", "0.28.0", require: false
gem "pronto", "0.9.5", require: false gem "pronto", "0.9.5", require: false
gem "pronto-eslint", "0.9.1", require: false gem "pronto-eslint", "0.9.1", require: false
gem "pronto-haml", "0.9.0", require: false gem "pronto-haml", "0.9.0", require: false
gem "pronto-rubocop", "0.9.0", require: false gem "pronto-rubocop", "0.9.1", require: false
gem "pronto-scss", "0.9.1", require: false gem "pronto-scss", "0.9.1", require: false
gem "rubocop", "0.54.0", require: false gem "rubocop", "0.60.0", require: false
# Preloading environment # Preloading environment
@ -269,7 +269,7 @@ group :development do
gem "pry-byebug" gem "pry-byebug"
# test coverage # test coverage
gem "simplecov", "0.14.1", require: false gem "simplecov", "0.16.1", require: false
gem "turbo_dev_assets", "0.0.2" gem "turbo_dev_assets", "0.0.2"
end end
@ -278,15 +278,15 @@ group :test do
# RSpec (unit tests, some integration tests) # RSpec (unit tests, some integration tests)
gem "fixture_builder", "0.5.2.rc3" gem "fixture_builder", "0.5.2.rc3"
gem "fuubar", "2.3.1" gem "fuubar", "2.3.2"
gem "json-schema-rspec", "0.0.4" 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)
gem "capybara", "2.18.0" gem "capybara", "2.18.0"
gem "database_cleaner", "1.6.2" gem "database_cleaner", "1.7.0"
gem "poltergeist", "1.17.0" gem "poltergeist", "1.18.1"
gem "cucumber-api-steps", "0.14", require: false gem "cucumber-api-steps", "0.14", require: false
@ -295,25 +295,25 @@ group :test do
gem "factory_girl_rails", "4.8.0" gem "factory_girl_rails", "4.8.0"
gem "shoulda-matchers", "3.1.2" gem "shoulda-matchers", "3.1.2"
gem "timecop", "0.9.1" gem "timecop", "0.9.1"
gem "webmock", "3.3.0", require: false gem "webmock", "3.4.2", require: false
gem "diaspora_federation-test", "0.2.5" gem "diaspora_federation-test", "0.2.5"
# Coverage # Coverage
gem "coveralls", "0.8.21", require: false gem "coveralls", "0.8.22", require: false
end end
group :development, :test do group :development, :test do
# RSpec (unit tests, some integration tests) # RSpec (unit tests, some integration tests)
gem "rspec-rails", "3.7.2" gem "rspec-rails", "3.8.1"
# Cucumber (integration tests) # Cucumber (integration tests)
gem "cucumber-rails", "1.5.0", require: false gem "cucumber-rails", "1.5.0", require: false
# Jasmine (client side application tests (JS)) # Jasmine (client side application tests (JS))
gem "jasmine", "3.1.0" gem "jasmine", "3.3.0"
gem "jasmine-jquery-rails", "2.0.3" gem "jasmine-jquery-rails", "2.0.3"
gem "rails-assets-jasmine-ajax", "3.3.1", source: "https://rails-assets.org" gem "rails-assets-jasmine-ajax", "3.4.0", source: "https://rails-assets.org"
gem "sinon-rails", "1.15.0" gem "sinon-rails", "1.15.0"
# For `assigns` in controller specs # For `assigns` in controller specs

343
Gemfile.lock
View file

@ -37,15 +37,15 @@ GEM
activemodel (= 5.1.6) activemodel (= 5.1.6)
activesupport (= 5.1.6) activesupport (= 5.1.6)
arel (~> 8.0) arel (~> 8.0)
activerecord-import (0.22.0) activerecord-import (0.27.0)
activerecord (>= 3.2) activerecord (>= 3.2)
activesupport (5.1.6) activesupport (5.1.6)
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)
tzinfo (~> 1.1) tzinfo (~> 1.1)
acts-as-taggable-on (5.0.0) acts-as-taggable-on (6.0.0)
activerecord (>= 4.2.8) activerecord (~> 5.0)
acts_as_api (1.0.1) acts_as_api (1.0.1)
activemodel (>= 3.0.0) activemodel (>= 3.0.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
@ -54,25 +54,25 @@ GEM
public_suffix (>= 2.0.2, < 4.0) public_suffix (>= 2.0.2, < 4.0)
aes_key_wrap (1.0.1) aes_key_wrap (1.0.1)
arel (8.0.0) arel (8.0.0)
asset_sync (2.4.0) asset_sync (2.5.0)
activemodel (>= 4.1.0) activemodel (>= 4.1.0)
fog-core fog-core
mime-types (>= 2.99) mime-types (>= 2.99)
unf unf
ast (2.4.0) ast (2.4.0)
attr_required (1.0.1) attr_required (1.0.1)
autoprefixer-rails (8.2.0) autoprefixer-rails (8.6.5)
execjs execjs
babel-source (5.8.35) babel-source (5.8.35)
babel-transpiler (0.7.0) babel-transpiler (0.7.0)
babel-source (>= 4.0, < 6) babel-source (>= 4.0, < 6)
execjs (~> 2.0) execjs (~> 2.0)
bcrypt (3.1.11) bcrypt (3.1.12)
bindata (2.4.3) bindata (2.4.4)
bootstrap-sass (3.3.7) bootstrap-sass (3.3.7)
autoprefixer-rails (>= 5.2.1) autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4) sass (>= 3.3.4)
bootstrap-switch-rails (3.3.3) bootstrap-switch-rails (3.3.4)
buftok (0.2.0) buftok (0.2.0)
builder (3.2.3) builder (3.2.3)
byebug (10.0.2) byebug (10.0.2)
@ -83,7 +83,7 @@ GEM
rack (>= 1.0.0) rack (>= 1.0.0)
rack-test (>= 0.5.4) rack-test (>= 0.5.4)
xpath (>= 2.0, < 4.0) xpath (>= 2.0, < 4.0)
carrierwave (1.2.2) carrierwave (1.2.3)
activemodel (>= 4.0.0) activemodel (>= 4.0.0)
activesupport (>= 4.0.0) activesupport (>= 4.0.0)
mime-types (>= 1.16) mime-types (>= 1.16)
@ -123,22 +123,22 @@ GEM
sass (>= 3.3.0, < 3.5) sass (>= 3.3.0, < 3.5)
compass-import-once (1.0.5) compass-import-once (1.0.5)
sass (>= 3.2, < 3.5) sass (>= 3.2, < 3.5)
compass-rails (3.0.2) compass-rails (3.1.0)
compass (~> 1.0.0) compass (~> 1.0.0)
sass-rails (< 5.1) sass-rails (< 5.1)
sprockets (< 4.0) sprockets (< 4.0)
concurrent-ruby (1.0.5) concurrent-ruby (1.1.3)
configurate (0.3.1) configurate (0.3.1)
connection_pool (2.2.1) connection_pool (2.2.2)
coveralls (0.8.21) coveralls (0.8.22)
json (>= 1.8, < 3) json (>= 1.8, < 3)
simplecov (~> 0.14.1) simplecov (~> 0.16.1)
term-ansicolor (~> 1.3) term-ansicolor (~> 1.3)
thor (~> 0.19.4) thor (~> 0.19.4)
tins (~> 1.6) tins (~> 1.6)
crack (0.4.3) crack (0.4.3)
safe_yaml (~> 1.0.0) safe_yaml (~> 1.0.0)
crass (1.0.3) crass (1.0.4)
cucumber (2.99.0) cucumber (2.99.0)
builder (>= 2.1.2) builder (>= 2.1.2)
cucumber-core (~> 1.5.0) cucumber-core (~> 1.5.0)
@ -159,8 +159,8 @@ GEM
nokogiri (~> 1.5) nokogiri (~> 1.5)
railties (>= 4, < 5.2) railties (>= 4, < 5.2)
cucumber-wire (0.0.1) cucumber-wire (0.0.1)
database_cleaner (1.6.2) database_cleaner (1.7.0)
devise (4.4.3) devise (4.5.0)
bcrypt (~> 3.0) bcrypt (~> 3.0)
orm_adapter (~> 0.1) orm_adapter (~> 0.1)
railties (>= 4.1.0, < 6.0) railties (>= 4.1.0, < 6.0)
@ -185,8 +185,8 @@ GEM
fabrication (~> 2.16) fabrication (~> 2.16)
uuid (~> 2.3, >= 2.3.8) uuid (~> 2.3, >= 2.3.8)
diff-lcs (1.3) diff-lcs (1.3)
docile (1.1.5) docile (1.3.1)
domain_name (0.5.20170404) domain_name (0.5.20180417)
unf (>= 0.0.5, < 1.0.0) unf (>= 0.0.5, < 1.0.0)
entypo-rails (3.0.0) entypo-rails (3.0.0)
railties (>= 4.1, < 6) railties (>= 4.1, < 6)
@ -196,7 +196,7 @@ GEM
execjs execjs
multi_json (>= 1.3) multi_json (>= 1.3)
rake rake
et-orbi (1.1.0) et-orbi (1.1.6)
tzinfo tzinfo
ethon (0.11.0) ethon (0.11.0)
ffi (>= 1.3.0) ffi (>= 1.3.0)
@ -214,7 +214,7 @@ GEM
factory_girl_rails (4.8.0) factory_girl_rails (4.8.0)
factory_girl (~> 4.8.0) factory_girl (~> 4.8.0)
railties (>= 3.0.0) railties (>= 3.0.0)
faraday (0.12.2) faraday (0.15.3)
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
faraday-cookie_jar (0.0.6) faraday-cookie_jar (0.0.6)
faraday (>= 0.7.4) faraday (>= 0.7.4)
@ -226,37 +226,41 @@ GEM
activerecord (>= 2) activerecord (>= 2)
activesupport (>= 2) activesupport (>= 2)
hashdiff hashdiff
fog-aws (2.0.1) fog-aws (3.3.0)
fog-core (~> 1.38) fog-core (~> 2.1)
fog-json (~> 1.0) fog-json (~> 1.1)
fog-xml (~> 0.1) fog-xml (~> 0.1)
ipaddress (~> 0.8) ipaddress (~> 0.8)
fog-core (1.45.0) fog-core (2.1.2)
builder builder
excon (~> 0.58) excon (~> 0.58)
formatador (~> 0.2) formatador (~> 0.2)
fog-json (1.0.2) mime-types
fog-core (~> 1.0) fog-json (1.2.0)
fog-core
multi_json (~> 1.10) multi_json (~> 1.10)
fog-xml (0.1.3) fog-xml (0.1.3)
fog-core fog-core
nokogiri (>= 1.5.11, < 2.0.0) nokogiri (>= 1.5.11, < 2.0.0)
formatador (0.2.5) formatador (0.2.5)
fuubar (2.3.1) fugit (1.1.6)
et-orbi (~> 1.1, >= 1.1.6)
raabro (~> 1.1)
fuubar (2.3.2)
rspec-core (~> 3.0) rspec-core (~> 3.0)
ruby-progressbar (~> 1.4) ruby-progressbar (~> 1.4)
get_process_mem (0.2.1) get_process_mem (0.2.3)
gherkin (4.1.3) gherkin (4.1.3)
gitlab (4.3.0) gitlab (4.7.0)
httparty httparty (>= 0.14.0)
terminal-table terminal-table (>= 1.5.1)
globalid (0.4.1) globalid (0.4.1)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
gon (6.2.0) gon (6.2.1)
actionpack (>= 3.0) actionpack (>= 3.0)
multi_json multi_json
request_store (>= 1.0) request_store (>= 1.0)
guard (2.14.2) guard (2.15.0)
formatador (>= 0.2.4) formatador (>= 0.2.4)
listen (>= 2.7, < 4.0) listen (>= 2.7, < 4.0)
lumberjack (>= 1.0.12, < 2.0) lumberjack (>= 1.0.12, < 2.0)
@ -280,13 +284,13 @@ GEM
haml (5.0.4) haml (5.0.4)
temple (>= 0.8.0) temple (>= 0.8.0)
tilt tilt
haml_lint (0.27.0) haml_lint (0.28.0)
haml (>= 4.0, < 5.1) haml (>= 4.0, < 5.1)
rainbow rainbow
rake (>= 10, < 13) rake (>= 10, < 13)
rubocop (>= 0.50.0) rubocop (>= 0.50.0)
sysexits (~> 1.1) sysexits (~> 1.1)
hamlit (2.8.8) hamlit (2.9.1)
temple (>= 0.8.0) temple (>= 0.8.0)
thor thor
tilt tilt
@ -296,21 +300,21 @@ GEM
tilt (>= 1.2) tilt (>= 1.2)
hashdiff (0.3.7) hashdiff (0.3.7)
hashie (3.5.7) hashie (3.5.7)
hitimes (1.2.6) http (3.3.0)
http (3.0.0)
addressable (~> 2.3) addressable (~> 2.3)
http-cookie (~> 1.0) http-cookie (~> 1.0)
http-form_data (>= 2.0.0.pre.pre2, < 3) http-form_data (~> 2.0)
http_parser.rb (~> 0.6.0) http_parser.rb (~> 0.6.0)
http-cookie (1.0.3) http-cookie (1.0.3)
domain_name (~> 0.5) domain_name (~> 0.5)
http-form_data (2.1.0) http-form_data (2.1.1)
http_accept_language (2.1.1) http_accept_language (2.1.1)
http_parser.rb (0.6.0) http_parser.rb (0.6.0)
httparty (0.16.2) httparty (0.16.3)
mime-types (~> 3.0)
multi_xml (>= 0.5.2) multi_xml (>= 0.5.2)
httpclient (2.8.3) httpclient (2.8.3)
i18n (1.1.0) i18n (1.1.1)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
i18n-inflector (2.6.7) i18n-inflector (2.6.7)
i18n (>= 0.4.1) i18n (>= 0.4.1)
@ -320,18 +324,19 @@ GEM
railties (>= 3.0.0) railties (>= 3.0.0)
idn-ruby (0.1.0) idn-ruby (0.1.0)
ipaddress (0.8.3) ipaddress (0.8.3)
jasmine (3.1.0) jaro_winkler (1.5.1)
jasmine-core (= 3.1.0) jasmine (3.3.0)
jasmine-core (~> 3.3.0)
phantomjs phantomjs
rack (>= 1.2.1) rack (>= 1.2.1)
rake rake
jasmine-core (3.1.0) jasmine-core (3.3.0)
jasmine-jquery-rails (2.0.3) jasmine-jquery-rails (2.0.3)
jquery-rails (4.3.1) jquery-rails (4.3.3)
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 (1.4.3) js-routes (1.4.4)
railties (>= 3.2) railties (>= 3.2)
sprockets-rails sprockets-rails
js_image_paths (0.1.1) js_image_paths (0.1.1)
@ -342,15 +347,15 @@ GEM
activesupport activesupport
aes_key_wrap aes_key_wrap
bindata bindata
json-schema (2.8.0) json-schema (2.8.1)
addressable (>= 2.4) addressable (>= 2.4)
json-schema-rspec (0.0.4) json-schema-rspec (0.0.4)
json-schema (~> 2.5) json-schema (~> 2.5)
rspec rspec
jsonpath (0.8.11) jsonpath (0.9.6)
multi_json multi_json
to_regexp (~> 0.2.1) to_regexp (~> 0.2.1)
jwt (1.5.6) jwt (2.1.0)
kgio (2.11.2) kgio (2.11.2)
kostya-sigar (2.0.4) kostya-sigar (2.0.4)
leaflet-rails (1.3.1) leaflet-rails (1.3.1)
@ -365,23 +370,23 @@ GEM
multi_json (~> 1.10) multi_json (~> 1.10)
logging-rails (0.6.0) logging-rails (0.6.0)
logging (>= 1.8) logging (>= 1.8)
loofah (2.2.2) loofah (2.2.3)
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
lumberjack (1.0.13) lumberjack (1.0.13)
macaddr (1.7.1) macaddr (1.7.1)
systemu (~> 2.6.2) systemu (~> 2.6.2)
mail (2.7.0) mail (2.7.1)
mini_mime (>= 0.1.1) mini_mime (>= 0.1.1)
markdown-it-html5-embed (1.0.0) markdown-it-html5-embed (1.0.0)
markerb (1.1.0) markerb (1.1.0)
memoizable (0.4.2) memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1) thread_safe (~> 0.3, >= 0.3.1)
method_source (0.9.0) method_source (0.9.2)
mime-types (3.1) mime-types (3.2.2)
mime-types-data (~> 3.2015) mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521) mime-types-data (3.2018.0812)
mini_magick (4.8.0) mini_magick (4.9.2)
mini_mime (1.0.1) mini_mime (1.0.1)
mini_portile2 (2.3.0) mini_portile2 (2.3.0)
minitest (5.11.3) minitest (5.11.3)
@ -392,23 +397,23 @@ GEM
multi_test (0.1.2) multi_test (0.1.2)
multi_xml (0.6.0) multi_xml (0.6.0)
multipart-post (2.0.0) multipart-post (2.0.0)
mysql2 (0.5.0) mysql2 (0.5.2)
naught (1.1.0) naught (1.1.0)
nenv (0.3.0) nenv (0.3.0)
nio4r (2.3.0) nio4r (2.3.1)
nokogiri (1.8.5) nokogiri (1.8.5)
mini_portile2 (~> 2.3.0) mini_portile2 (~> 2.3.0)
notiffany (0.1.1) notiffany (0.1.1)
nenv (~> 0.1) nenv (~> 0.1)
shellany (~> 0.0) shellany (~> 0.0)
oauth (0.5.4) oauth (0.5.4)
oauth2 (1.4.0) oauth2 (1.4.1)
faraday (>= 0.8, < 0.13) faraday (>= 0.8, < 0.16.0)
jwt (~> 1.0) jwt (>= 1.0, < 3.0)
multi_json (~> 1.3) multi_json (~> 1.3)
multi_xml (~> 0.5) multi_xml (~> 0.5)
rack (>= 1.2, < 3) rack (>= 1.2, < 3)
octokit (4.8.0) octokit (4.13.0)
sawyer (~> 0.8.0, >= 0.5.3) sawyer (~> 0.8.0, >= 0.5.3)
omniauth (1.8.1) omniauth (1.8.1)
hashie (>= 3.4.6, < 3.6.0) hashie (>= 3.4.6, < 3.6.0)
@ -442,15 +447,15 @@ GEM
webfinger (>= 1.0.1) webfinger (>= 1.0.1)
orm_adapter (0.5.0) orm_adapter (0.5.0)
parallel (1.12.1) parallel (1.12.1)
parser (2.5.0.5) parser (2.5.3.0)
ast (~> 2.4.0) ast (~> 2.4.0)
pg (1.0.0) pg (1.1.3)
phantomjs (2.1.1.0) phantomjs (2.1.1.0)
poltergeist (1.17.0) poltergeist (1.18.1)
capybara (~> 2.1) capybara (>= 2.1, < 4)
cliver (~> 0.3.1) cliver (~> 0.3.1)
websocket-driver (>= 0.2.0) websocket-driver (>= 0.2.0)
powerpack (0.1.1) powerpack (0.1.2)
pronto (0.9.5) pronto (0.9.5)
gitlab (~> 4.0, >= 4.0.0) gitlab (~> 4.0, >= 4.0.0)
httparty (>= 0.13.7) httparty (>= 0.13.7)
@ -464,19 +469,20 @@ GEM
pronto-haml (0.9.0) pronto-haml (0.9.0)
haml_lint (~> 0.23) haml_lint (~> 0.23)
pronto (~> 0.9.0) pronto (~> 0.9.0)
pronto-rubocop (0.9.0) pronto-rubocop (0.9.1)
pronto (~> 0.9.0) pronto (~> 0.9.0)
rubocop (~> 0.38, >= 0.35.0) rubocop (~> 0.50, >= 0.49.1)
pronto-scss (0.9.1) pronto-scss (0.9.1)
pronto (~> 0.9.0) pronto (~> 0.9.0)
scss_lint (~> 0.43, >= 0.43.0) scss_lint (~> 0.43, >= 0.43.0)
pry (0.11.3) pry (0.12.2)
coderay (~> 1.1.0) coderay (~> 1.1.0)
method_source (~> 0.9.0) method_source (~> 0.9.0)
pry-byebug (3.6.0) pry-byebug (3.6.0)
byebug (~> 10.0) byebug (~> 10.0)
pry (~> 0.10) pry (~> 0.10)
public_suffix (3.0.3) public_suffix (3.0.3)
raabro (1.1.6)
rack (2.0.6) rack (2.0.6)
rack-cors (1.0.2) rack-cors (1.0.2)
rack-google-analytics (1.2.0) rack-google-analytics (1.2.0)
@ -484,19 +490,19 @@ GEM
activesupport activesupport
rack-mobile-detect (0.4.0) rack-mobile-detect (0.4.0)
rack rack
rack-oauth2 (1.9.2) rack-oauth2 (1.9.3)
activesupport activesupport
attr_required attr_required
httpclient httpclient
json-jwt (>= 1.9.0) json-jwt (>= 1.9.0)
rack rack
rack-piwik (0.3.0) rack-piwik (0.3.0)
rack-protection (2.0.1) rack-protection (2.0.4)
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.0.0) rack-test (1.1.0)
rack (>= 1.0, < 3) rack (>= 1.0, < 3)
rails (5.1.6) rails (5.1.6)
actioncable (= 5.1.6) actioncable (= 5.1.6)
@ -510,7 +516,7 @@ GEM
bundler (>= 1.3.0) bundler (>= 1.3.0)
railties (= 5.1.6) railties (= 5.1.6)
sprockets-rails (>= 2.0.0) sprockets-rails (>= 2.0.0)
rails-assets-autosize (4.0.1) rails-assets-autosize (4.0.2)
rails-assets-backbone (1.3.3) rails-assets-backbone (1.3.3)
rails-assets-underscore (>= 1.8.3) rails-assets-underscore (>= 1.8.3)
rails-assets-blueimp-gallery (2.33.0) rails-assets-blueimp-gallery (2.33.0)
@ -532,10 +538,10 @@ GEM
rails-assets-favico.js (0.3.10) rails-assets-favico.js (0.3.10)
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 (2.99.2) rails-assets-jasmine (3.3.0)
rails-assets-jasmine-ajax (3.3.1) rails-assets-jasmine-ajax (3.4.0)
rails-assets-jasmine (~> 2) rails-assets-jasmine (~> 3)
rails-assets-jquery (3.2.1) rails-assets-jquery (3.3.1)
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)
@ -549,15 +555,15 @@ GEM
rails-assets-jquery.ui (1.11.4) rails-assets-jquery.ui (1.11.4)
rails-assets-jquery (>= 1.6) rails-assets-jquery (>= 1.6)
rails-assets-markdown-it--markdown-it-for-inline (0.1.1) rails-assets-markdown-it--markdown-it-for-inline (0.1.1)
rails-assets-markdown-it (8.4.1) rails-assets-markdown-it (8.4.2)
rails-assets-markdown-it-diaspora-mention (1.2.0) rails-assets-markdown-it-diaspora-mention (1.2.0)
rails-assets-markdown-it-hashtag (0.4.0) rails-assets-markdown-it-hashtag (0.4.0)
rails-assets-markdown-it-sanitizer (0.4.3) rails-assets-markdown-it-sanitizer (0.4.3)
rails-assets-markdown-it-sub (1.0.0) rails-assets-markdown-it-sub (1.0.0)
rails-assets-markdown-it-sup (1.0.0) rails-assets-markdown-it-sup (1.0.0)
rails-assets-pica (4.0.1) rails-assets-pica (4.0.1)
rails-assets-underscore (1.8.3) rails-assets-underscore (1.9.1)
rails-assets-utatti-perfect-scrollbar (1.3.0) rails-assets-utatti-perfect-scrollbar (1.4.0)
rails-controller-testing (1.0.2) rails-controller-testing (1.0.2)
actionpack (~> 5.x, >= 5.0.1) actionpack (~> 5.x, >= 5.0.1)
actionview (~> 5.x, >= 5.0.1) actionview (~> 5.x, >= 5.0.1)
@ -567,7 +573,7 @@ GEM
nokogiri (>= 1.6) nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4) rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2) loofah (~> 2.2, >= 2.2.2)
rails-i18n (5.1.1) rails-i18n (5.1.2)
i18n (>= 0.7, < 2) i18n (>= 0.7, < 2)
railties (>= 5.0, < 6) railties (>= 5.0, < 6)
rails-timeago (2.16.0) rails-timeago (2.16.0)
@ -593,42 +599,41 @@ GEM
responders (2.4.0) responders (2.4.0)
actionpack (>= 4.2.0, < 5.3) actionpack (>= 4.2.0, < 5.3)
railties (>= 4.2.0, < 5.3) railties (>= 4.2.0, < 5.3)
rspec (3.7.0) rspec (3.8.0)
rspec-core (~> 3.7.0) rspec-core (~> 3.8.0)
rspec-expectations (~> 3.7.0) rspec-expectations (~> 3.8.0)
rspec-mocks (~> 3.7.0) rspec-mocks (~> 3.8.0)
rspec-core (3.7.1) rspec-core (3.8.0)
rspec-support (~> 3.7.0) rspec-support (~> 3.8.0)
rspec-expectations (3.7.0) rspec-expectations (3.8.2)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.7.0) rspec-support (~> 3.8.0)
rspec-json_expectations (2.1.0) rspec-json_expectations (2.1.0)
rspec-mocks (3.7.0) rspec-mocks (3.8.0)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.7.0) rspec-support (~> 3.8.0)
rspec-rails (3.7.2) rspec-rails (3.8.1)
actionpack (>= 3.0) actionpack (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
railties (>= 3.0) railties (>= 3.0)
rspec-core (~> 3.7.0) rspec-core (~> 3.8.0)
rspec-expectations (~> 3.7.0) rspec-expectations (~> 3.8.0)
rspec-mocks (~> 3.7.0) rspec-mocks (~> 3.8.0)
rspec-support (~> 3.7.0) rspec-support (~> 3.8.0)
rspec-support (3.7.1) rspec-support (3.8.0)
rubocop (0.54.0) rubocop (0.60.0)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10) parallel (~> 1.10)
parser (>= 2.5) parser (>= 2.5, != 2.5.1.1)
powerpack (~> 0.1) powerpack (~> 0.1)
rainbow (>= 2.2.2, < 4.0) rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7) ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1) unicode-display_width (~> 1.4.0)
ruby-oembed (0.12.0) ruby-oembed (0.12.0)
ruby-progressbar (1.9.0) ruby-progressbar (1.10.0)
ruby_dep (1.5.0) ruby_dep (1.5.0)
rubyzip (1.2.2) rubyzip (1.2.2)
rufus-scheduler (3.4.2) rugged (0.27.5)
et-orbi (~> 1.0)
rugged (0.27.0)
safe_yaml (1.0.4) safe_yaml (1.0.4)
sass (3.4.25) sass (3.4.25)
sass-rails (5.0.7) sass-rails (5.0.7)
@ -643,24 +648,22 @@ GEM
scss_lint (0.55.0) scss_lint (0.55.0)
rake (>= 0.9, < 13) rake (>= 0.9, < 13)
sass (~> 3.4.20) sass (~> 3.4.20)
secure_headers (5.0.5) secure_headers (6.0.0)
useragent (>= 0.15.0)
shellany (0.0.1) shellany (0.0.1)
shoulda-matchers (3.1.2) shoulda-matchers (3.1.2)
activesupport (>= 4.0.0) activesupport (>= 4.0.0)
sidekiq (5.1.3) sidekiq (5.2.3)
concurrent-ruby (~> 1.0) connection_pool (~> 2.2, >= 2.2.2)
connection_pool (~> 2.2, >= 2.2.0)
rack-protection (>= 1.5.0) rack-protection (>= 1.5.0)
redis (>= 3.3.5, < 5) redis (>= 3.3.5, < 5)
sidekiq-cron (0.6.3) sidekiq-cron (1.0.4)
rufus-scheduler (>= 3.3.0) fugit (~> 1.1)
sidekiq (>= 4.2.1) sidekiq (>= 4.2.1)
simple_captcha2 (0.4.3) simple_captcha2 (0.4.3)
rails (>= 4.1) rails (>= 4.1)
simple_oauth (0.3.1) simple_oauth (0.3.1)
simplecov (0.14.1) simplecov (0.16.1)
docile (~> 1.1.0) docile (~> 1.1)
json (>= 1.8, < 3) json (>= 1.8, < 3)
simplecov-html (~> 0.10.0) simplecov-html (~> 0.10.0)
simplecov-html (0.10.2) simplecov-html (0.10.2)
@ -692,7 +695,7 @@ GEM
sysexits (1.2.0) sysexits (1.2.0)
systemu (2.6.5) systemu (2.6.5)
temple (0.8.0) temple (0.8.0)
term-ansicolor (1.6.0) term-ansicolor (1.7.0)
tins (~> 1.0) tins (~> 1.0)
terminal-table (1.8.0) terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1) unicode-display_width (~> 1.1, >= 1.1.1)
@ -700,9 +703,8 @@ GEM
thread_safe (0.3.6) thread_safe (0.3.6)
tilt (2.0.8) tilt (2.0.8)
timecop (0.9.1) timecop (0.9.1)
timers (4.1.2) timers (4.2.0)
hitimes tins (1.20.2)
tins (1.16.3)
to_regexp (0.2.1) to_regexp (0.2.1)
turbo_dev_assets (0.0.2) turbo_dev_assets (0.0.2)
twitter (6.2.0) twitter (6.2.0)
@ -719,24 +721,23 @@ GEM
twitter-text (2.1.0) twitter-text (2.1.0)
idn-ruby idn-ruby
unf (~> 0.1.0) unf (~> 0.1.0)
typhoeus (1.3.0) typhoeus (1.3.1)
ethon (>= 0.9.0) ethon (>= 0.9.0)
tzinfo (1.2.5) tzinfo (1.2.5)
thread_safe (~> 0.1) thread_safe (~> 0.1)
uglifier (4.1.8) uglifier (4.1.19)
execjs (>= 0.3.0, < 3) execjs (>= 0.3.0, < 3)
unf (0.1.4) unf (0.1.4)
unf_ext unf_ext
unf_ext (0.0.7.5) unf_ext (0.0.7.5)
unicode-display_width (1.4.0) unicode-display_width (1.4.0)
unicorn (5.4.0) unicorn (5.4.1)
kgio (~> 2.6) kgio (~> 2.6)
raindrops (~> 0.7) raindrops (~> 0.7)
unicorn-worker-killer (0.4.4) unicorn-worker-killer (0.4.4)
get_process_mem (~> 0) get_process_mem (~> 0)
unicorn (>= 4, < 6) unicorn (>= 4, < 6)
useragent (0.16.10) uuid (2.3.9)
uuid (2.3.8)
macaddr (~> 1.0) macaddr (~> 1.0)
valid (1.2.0) valid (1.2.0)
validate_email (0.1.6) validate_email (0.1.6)
@ -749,12 +750,12 @@ GEM
activesupport (>= 3) activesupport (>= 3)
railties (>= 3) railties (>= 3)
yard (~> 0.9.11) yard (~> 0.9.11)
warden (1.2.7) warden (1.2.8)
rack (>= 1.0) rack (>= 2.0.6)
webfinger (1.1.0) webfinger (1.1.0)
activesupport activesupport
httpclient (>= 2.4) httpclient (>= 2.4)
webmock (3.3.0) webmock (3.4.2)
addressable (>= 2.3.6) addressable (>= 2.3.6)
crack (>= 0.3.2) crack (>= 0.3.2)
hashdiff hashdiff
@ -762,32 +763,32 @@ GEM
websocket-extensions (>= 0.1.0) websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3) websocket-extensions (0.1.3)
will_paginate (3.1.6) will_paginate (3.1.6)
xpath (3.0.0) xpath (3.2.0)
nokogiri (~> 1.8) nokogiri (~> 1.8)
yard (0.9.12) yard (0.9.16)
PLATFORMS PLATFORMS
ruby ruby
DEPENDENCIES DEPENDENCIES
active_model_serializers (= 0.9.7) active_model_serializers (= 0.9.7)
activerecord-import (= 0.22.0) activerecord-import (= 0.27.0)
acts-as-taggable-on (= 5.0.0) acts-as-taggable-on (= 6.0.0)
acts_as_api (= 1.0.1) acts_as_api (= 1.0.1)
addressable (= 2.5.2) addressable (= 2.5.2)
asset_sync (= 2.4.0) asset_sync (= 2.5.0)
autoprefixer-rails (= 8.2.0) autoprefixer-rails (= 8.6.5)
bootstrap-sass (= 3.3.7) bootstrap-sass (= 3.3.7)
bootstrap-switch-rails (= 3.3.3) bootstrap-switch-rails (= 3.3.4)
capybara (= 2.18.0) capybara (= 2.18.0)
carrierwave (= 1.2.2) carrierwave (= 1.2.3)
compass-rails (= 3.0.2) compass-rails (= 3.1.0)
configurate (= 0.3.1) configurate (= 0.3.1)
coveralls (= 0.8.21) coveralls (= 0.8.22)
cucumber-api-steps (= 0.14) cucumber-api-steps (= 0.14)
cucumber-rails (= 1.5.0) cucumber-rails (= 1.5.0)
database_cleaner (= 1.6.2) database_cleaner (= 1.7.0)
devise (= 4.4.3) devise (= 4.5.0)
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.5) diaspora_federation-json_schema (= 0.2.5)
@ -796,38 +797,38 @@ DEPENDENCIES
entypo-rails (= 3.0.0) entypo-rails (= 3.0.0)
eye (= 0.10.0) eye (= 0.10.0)
factory_girl_rails (= 4.8.0) factory_girl_rails (= 4.8.0)
faraday (= 0.12.2) faraday (= 0.15.3)
faraday-cookie_jar (= 0.0.6) faraday-cookie_jar (= 0.0.6)
faraday_middleware (= 0.12.2) faraday_middleware (= 0.12.2)
fixture_builder (= 0.5.2.rc3) fixture_builder (= 0.5.2.rc3)
fog-aws (= 2.0.1) fog-aws (= 3.3.0)
fuubar (= 2.3.1) fuubar (= 2.3.2)
gon (= 6.2.0) gon (= 6.2.1)
guard (= 2.14.2) guard (= 2.15.0)
guard-cucumber (= 2.1.2) guard-cucumber (= 2.1.2)
guard-rspec (= 4.7.3) guard-rspec (= 4.7.3)
guard-rubocop (= 1.3.0) guard-rubocop (= 1.3.0)
haml_lint (= 0.27.0) haml_lint (= 0.28.0)
hamlit (= 2.8.8) hamlit (= 2.9.1)
handlebars_assets (= 0.23.2) handlebars_assets (= 0.23.2)
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.1.0) jasmine (= 3.3.0)
jasmine-jquery-rails (= 2.0.3) jasmine-jquery-rails (= 2.0.3)
jquery-rails (= 4.3.1) jquery-rails (= 4.3.3)
js-routes (= 1.4.3) js-routes (= 1.4.4)
js_image_paths (= 0.1.1) js_image_paths (= 0.1.1)
json (= 2.1.0) json (= 2.1.0)
json-schema (= 2.8.0) json-schema (= 2.8.1)
json-schema-rspec (= 0.0.4) json-schema-rspec (= 0.0.4)
leaflet-rails (= 1.3.1) leaflet-rails (= 1.3.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.8.0) mini_magick (= 4.9.2)
minitest minitest
mobile-fu (= 1.4.0) mobile-fu (= 1.4.0)
mysql2 (= 0.5.0) mysql2 (= 0.5.2)
nokogiri (= 1.8.5) nokogiri (= 1.8.5)
omniauth (= 1.8.1) omniauth (= 1.8.1)
omniauth-tumblr (= 1.2) omniauth-tumblr (= 1.2)
@ -835,12 +836,12 @@ DEPENDENCIES
omniauth-wordpress (= 0.2.2) omniauth-wordpress (= 0.2.2)
open_graph_reader (= 0.6.2) open_graph_reader (= 0.6.2)
openid_connect (= 1.1.6) openid_connect (= 1.1.6)
pg (= 1.0.0) pg (= 1.1.3)
poltergeist (= 1.17.0) poltergeist (= 1.18.1)
pronto (= 0.9.5) pronto (= 0.9.5)
pronto-eslint (= 0.9.1) pronto-eslint (= 0.9.1)
pronto-haml (= 0.9.0) pronto-haml (= 0.9.0)
pronto-rubocop (= 0.9.0) pronto-rubocop (= 0.9.1)
pronto-scss (= 0.9.1) pronto-scss (= 0.9.1)
pry pry
pry-byebug pry-byebug
@ -850,7 +851,7 @@ DEPENDENCIES
rack-rewrite (= 1.5.1) rack-rewrite (= 1.5.1)
rack-ssl (= 1.4.1) rack-ssl (= 1.4.1)
rails (= 5.1.6) rails (= 5.1.6)
rails-assets-autosize (= 4.0.1)! 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-markdown (= 2.10.0)! rails-assets-bootstrap-markdown (= 2.10.0)!
@ -859,13 +860,13 @@ DEPENDENCIES
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 (= 3.3.1)! rails-assets-jasmine-ajax (= 3.4.0)!
rails-assets-jquery (= 3.2.1)! rails-assets-jquery (= 3.3.1)!
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)!
rails-assets-jquery.ui (= 1.11.4)! rails-assets-jquery.ui (= 1.11.4)!
rails-assets-markdown-it (= 8.4.1)! rails-assets-markdown-it (= 8.4.2)!
rails-assets-markdown-it--markdown-it-for-inline (= 0.1.1)! rails-assets-markdown-it--markdown-it-for-inline (= 0.1.1)!
rails-assets-markdown-it-diaspora-mention (= 1.2.0)! rails-assets-markdown-it-diaspora-mention (= 1.2.0)!
rails-assets-markdown-it-hashtag (= 0.4.0)! rails-assets-markdown-it-hashtag (= 0.4.0)!
@ -873,9 +874,9 @@ DEPENDENCIES
rails-assets-markdown-it-sub (= 1.0.0)! rails-assets-markdown-it-sub (= 1.0.0)!
rails-assets-markdown-it-sup (= 1.0.0)! rails-assets-markdown-it-sup (= 1.0.0)!
rails-assets-pica (= 4.0.1)! rails-assets-pica (= 4.0.1)!
rails-assets-utatti-perfect-scrollbar (= 1.3.0)! rails-assets-utatti-perfect-scrollbar (= 1.4.0)!
rails-controller-testing (= 1.0.2) rails-controller-testing (= 1.0.2)
rails-i18n (= 5.1.1) rails-i18n (= 5.1.2)
rails-timeago (= 2.16.0) rails-timeago (= 2.16.0)
rb-fsevent (= 0.10.3) rb-fsevent (= 0.10.3)
rb-inotify (= 0.9.10) rb-inotify (= 0.9.10)
@ -883,17 +884,17 @@ DEPENDENCIES
redis (= 3.3.5) redis (= 3.3.5)
responders (= 2.4.0) responders (= 2.4.0)
rspec-json_expectations (~> 2.1) rspec-json_expectations (~> 2.1)
rspec-rails (= 3.7.2) rspec-rails (= 3.8.1)
rubocop (= 0.54.0) rubocop (= 0.60.0)
ruby-oembed (= 0.12.0) ruby-oembed (= 0.12.0)
rubyzip (= 1.2.2) rubyzip (= 1.2.2)
sass-rails (= 5.0.7) sass-rails (= 5.0.7)
secure_headers (= 5.0.5) secure_headers (= 6.0.0)
shoulda-matchers (= 3.1.2) shoulda-matchers (= 3.1.2)
sidekiq (= 5.1.3) sidekiq (= 5.2.3)
sidekiq-cron (= 0.6.3) sidekiq-cron (= 1.0.4)
simple_captcha2 (= 0.4.3) simple_captcha2 (= 0.4.3)
simplecov (= 0.14.1) simplecov (= 0.16.1)
sinon-rails (= 1.15.0) sinon-rails (= 1.15.0)
spring (= 2.0.2) spring (= 2.0.2)
spring-commands-cucumber (= 1.0.1) spring-commands-cucumber (= 1.0.1)
@ -905,13 +906,13 @@ DEPENDENCIES
turbo_dev_assets (= 0.0.2) turbo_dev_assets (= 0.0.2)
twitter (= 6.2.0) twitter (= 6.2.0)
twitter-text (= 2.1.0) twitter-text (= 2.1.0)
typhoeus (= 1.3.0) typhoeus (= 1.3.1)
uglifier (= 4.1.8) uglifier (= 4.1.19)
unicorn (= 5.4.0) unicorn (= 5.4.1)
unicorn-worker-killer (= 0.4.4) unicorn-worker-killer (= 0.4.4)
uuid (= 2.3.8) uuid (= 2.3.9)
versionist (= 1.7.0) versionist (= 1.7.0)
webmock (= 3.3.0) webmock (= 3.4.2)
will_paginate (= 3.1.6) will_paginate (= 3.1.6)
BUNDLED WITH BUNDLED WITH

3
app/models/profile.rb
View file

@ -157,8 +157,9 @@ class Profile < ApplicationRecord
end end
private private
def clearable_fields def clearable_fields
self.attributes.keys - ["id", "created_at", "updated_at", "person_id"] attributes.keys - %w[id created_at updated_at person_id tag_list]
end end
def build_image_url(url) def build_image_url(url)

8
spec/controllers/api/openid_connect/authorizations_controller_spec.rb
View file

@ -31,12 +31,10 @@ describe Api::OpenidConnect::AuthorizationsController, type: :request do
context "as a request object" do context "as a request object" do
it "should return a form page" do it "should return a form page" do
header = JWT.encoded_header("none")
payload_hash = {client_id: client.client_id, redirect_uri: "http://localhost:3000/", payload_hash = {client_id: client.client_id, redirect_uri: "http://localhost:3000/",
response_type: "id_token", scope: "openid", nonce: "hello", state: "hello", response_type: "id_token", scope: "openid", nonce: "hello", state: "hello",
claims: {userinfo: {name: {essential: true}}}} claims: {userinfo: {name: {essential: true}}}}
payload = JWT.encoded_payload(JSON.parse(payload_hash.to_json)) request_object = JWT.encode(payload_hash, nil, "none")
request_object = header + "." + payload + "."
get new_api_openid_connect_authorization_path, params: {client_id: client.client_id, get new_api_openid_connect_authorization_path, params: {client_id: client.client_id,
redirect_uri: "http://localhost:3000/", response_type: "id_token", redirect_uri: "http://localhost:3000/", response_type: "id_token",
scope: "openid", nonce: "hello", state: "hello", request: request_object} scope: "openid", nonce: "hello", state: "hello", request: request_object}
@ -46,11 +44,9 @@ describe Api::OpenidConnect::AuthorizationsController, type: :request do
context "as a request object with no claims" do context "as a request object with no claims" do
it "should return a form page" do it "should return a form page" do
header = JWT.encoded_header("none")
payload_hash = {client_id: client.client_id, redirect_uri: "http://localhost:3000/", payload_hash = {client_id: client.client_id, redirect_uri: "http://localhost:3000/",
response_type: "id_token", scope: "openid", nonce: "hello", state: "hello"} response_type: "id_token", scope: "openid", nonce: "hello", state: "hello"}
payload = JWT.encoded_payload(JSON.parse(payload_hash.to_json)) request_object = JWT.encode(payload_hash, nil, "none")
request_object = header + "." + payload + "."
get new_api_openid_connect_authorization_path, params: {client_id: client.client_id, get new_api_openid_connect_authorization_path, params: {client_id: client.client_id,
redirect_uri: "http://localhost:3000/", response_type: "id_token", redirect_uri: "http://localhost:3000/", response_type: "id_token",
scope: "openid", nonce: "hello", state: "hello", request: request_object} scope: "openid", nonce: "hello", state: "hello", request: request_object}

8
spec/controllers/api/openid_connect/clients_controller_spec.rb
View file

@ -8,7 +8,7 @@ describe Api::OpenidConnect::ClientsController, type: :controller, suppress_csrf
.with(headers: { .with(headers: {
"Accept" => "*/*", "Accept" => "*/*",
"Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3", "Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3",
"User-Agent" => "Faraday v0.12.2" "User-Agent" => "Faraday v#{Faraday::VERSION}"
}) })
.to_return(status: 200, body: "[\"http://localhost\"]", headers: {}) .to_return(status: 200, body: "[\"http://localhost\"]", headers: {})
post :create, params: {redirect_uris: ["http://localhost"], client_name: "diaspora client", post :create, params: {redirect_uris: ["http://localhost"], client_name: "diaspora client",
@ -28,7 +28,7 @@ describe Api::OpenidConnect::ClientsController, type: :controller, suppress_csrf
.with(headers: { .with(headers: {
"Accept" => "*/*", "Accept" => "*/*",
"Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3", "Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3",
"User-Agent" => "Faraday v0.12.2" "User-Agent" => "Faraday v#{Faraday::VERSION}"
}) })
.to_return(status: 200, body: "[\"http://localhost\"]", headers: {}) .to_return(status: 200, body: "[\"http://localhost\"]", headers: {})
post :create, params: {redirect_uris: ["http://localhost"], client_name: "diaspora client", post :create, params: {redirect_uris: ["http://localhost"], client_name: "diaspora client",
@ -89,14 +89,14 @@ describe Api::OpenidConnect::ClientsController, type: :controller, suppress_csrf
.with(headers: { .with(headers: {
"Accept" => "*/*", "Accept" => "*/*",
"Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3", "Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3",
"User-Agent" => "Faraday v0.12.2" "User-Agent" => "Faraday v#{Faraday::VERSION}"
}) })
.to_return(status: 200, body: "[\"http://localhost\"]", headers: {}) .to_return(status: 200, body: "[\"http://localhost\"]", headers: {})
stub_request(:get, "https://kentshikama.com/api/openid_connect/jwks.json") stub_request(:get, "https://kentshikama.com/api/openid_connect/jwks.json")
.with(headers: { .with(headers: {
"Accept" => "*/*", "Accept" => "*/*",
"Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3", "Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3",
"User-Agent" => "Faraday v0.12.2" "User-Agent" => "Faraday v#{Faraday::VERSION}"
}) })
.to_return(status: 200, .to_return(status: 200,
body: "{\"keys\":[{\"kty\":\"RSA\",\"e\":\"AQAB\",\"n\":\"qpW\",\"use\":\"sig\"}]}", headers: {}) body: "{\"keys\":[{\"kty\":\"RSA\",\"e\":\"AQAB\",\"n\":\"qpW\",\"use\":\"sig\"}]}", headers: {})