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:
Jonne Haß 2020-03-20 20:06:04 +01:00
commit 221ef7b932
5 changed files with 272 additions and 254 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
.rubocop.yml
View file

@ -12,7 +12,7 @@ Rails/HttpPositionalArguments:
Enabled: false
# Commonly used screens these days easily fit more than 80 characters.
Metrics/LineLength:
Layout/LineLength:
Max: 120
# Too short methods lead to extraction of single-use methods, which can make
@ -62,7 +62,7 @@ Style/SymbolArray:
Enabled: true
# Most readable form.
Layout/AlignHash:
Layout/HashAlignment:
EnforcedHashRocketStyle: table
EnforcedColonStyle: table
@ -84,7 +84,6 @@ Style/CollectionMethods:
# inject seems more common in the community.
reduce: "inject"
# Either allow this style or don't. Marking it as safe with parenthesis
# is silly. Let's try to live without them for now.
Style/ParenthesesAroundCondition:
@ -111,7 +110,7 @@ Style/SignalException:
# Suppressing exceptions can be perfectly fine, and be it to avoid to
# explicitly type nil into the rescue since that's what you want to return,
# or suppressing LoadError for optional dependencies
Lint/HandleExceptions:
Lint/SuppressedException:
Enabled: false
Layout/SpaceInsideBlockBraces:
@ -174,3 +173,13 @@ Style/NumericPredicate:
# Reset some HoundCI changes back to Rubocop defaults
Layout/DotPosition:
EnforcedStyle: leading
# Not enabled by default but good
Style/HashEachMethods:
Enabled: true
# TODO: Enable with Ruby 2.5
Style/HashTransformKeys:
Enabled: false
Style/HashTransformValues:
Enabled: false

4
.travis.yml
View file

@ -1,8 +1,8 @@
language: ruby
rvm:
- 2.4.2
- 2.3.5
- 2.4.9
- 2.3.8
env:
- DB=postgresql BUILD_TYPE=cucumber

82
Gemfile
View file

@ -2,7 +2,7 @@
source "https://rubygems.org"
gem "rails", "5.2.4.1"
gem "rails", "5.2.4.2"
# Legacy Rails features, remove me!
# responders (class level)
@ -10,7 +10,7 @@ gem "responders", "2.4.1"
# Appserver
gem "unicorn", "5.5.1", require: false
gem "unicorn", "5.5.3", require: false
gem "unicorn-worker-killer", "0.4.4"
# Federation
@ -21,7 +21,7 @@ gem "diaspora_federation-rails", "0.2.6"
# API and JSON
gem "acts_as_api", "1.0.1"
gem "json", "2.2.0"
gem "json", "2.3.0"
gem "json-schema", "2.8.1"
gem "yajl-ruby", "1.4.1"
@ -30,16 +30,16 @@ gem "yajl-ruby", "1.4.1"
gem "devise", "4.7.1"
gem "devise-two-factor", "3.0.3"
gem "devise_lastseenable", "0.0.6"
gem "rqrcode", "0.10.1"
gem "rqrcode", "1.1.2"
# Captcha
gem "simple_captcha2", "0.4.3", require: "simple_captcha"
gem "simple_captcha2", "0.5.0", require: "simple_captcha"
# Background processing
gem "redis", "3.3.5" # Pinned to 3.3.x because of https://github.com/antirez/redis/issues/4272
gem "sidekiq", "5.2.7"
gem "sidekiq", "5.2.8"
# Scheduled processing
@ -47,7 +47,7 @@ gem "sidekiq-cron", "1.1.0"
# Compression
gem "uglifier", "4.1.20"
gem "uglifier", "4.2.0"
# Configuration
@ -69,19 +69,19 @@ gem "sprockets-rails", "3.2.1"
# Database
group :mysql, optional: true do
gem "mysql2", "0.5.2"
gem "mysql2", "0.5.3"
end
group :postgresql, optional: true do
gem "pg", "1.1.4"
gem "pg", "1.2.3"
end
gem "activerecord-import", "1.0.2"
gem "activerecord-import", "1.0.4"
# File uploading
gem "carrierwave", "1.3.1"
gem "fog-aws", "3.5.1"
gem "fog-aws", "3.5.2"
gem "mini_magick", "4.10.1"
# GUID generation
@ -93,9 +93,9 @@ gem "entypo-rails", "3.0.0"
# JavaScript
gem "handlebars_assets", "0.23.4"
gem "handlebars_assets", "0.23.8"
gem "jquery-rails", "4.3.5"
gem "js-routes", "1.4.7"
gem "js-routes", "1.4.9"
gem "js_image_paths", "0.1.1"
gem "sprockets-es6", "0.9.2"
@ -142,19 +142,19 @@ gem "rails-i18n", "5.1.3"
gem "markerb", "1.1.0"
# Map
gem "leaflet-rails", "1.5.1"
gem "leaflet-rails", "1.6.0"
# Parsing
gem "nokogiri", "1.10.8"
gem "nokogiri", "1.10.9"
gem "open_graph_reader", "0.7.0" # also update User-Agent in features/support/webmock.rb
gem "redcarpet", "3.4.0"
gem "redcarpet", "3.5.0"
gem "ruby-oembed", "0.12.0"
gem "twitter-text", "3.0.0"
# RTL support
gem "string-direction", "1.2.1"
gem "string-direction", "1.2.2"
# Security Headers
@ -162,11 +162,11 @@ gem "secure_headers", "6.3.0"
# Services
gem "omniauth", "1.9.0"
gem "omniauth", "1.9.1"
gem "omniauth-tumblr", "1.2"
gem "omniauth-twitter", "1.4.0"
gem "omniauth-wordpress", "0.2.2"
gem "twitter", "6.2.0"
gem "twitter", "7.0.0"
# OpenID Connect
gem "openid_connect", "1.1.8"
@ -177,11 +177,11 @@ gem "active_model_serializers", "0.9.7"
# Tags
gem "acts-as-taggable-on", "6.0.0"
gem "acts-as-taggable-on", "6.5.0"
# URIs and HTTP
gem "addressable", "2.6.0", require: "addressable/uri"
gem "addressable", "2.7.0", require: "addressable/uri"
gem "faraday", "0.15.4"
gem "faraday_middleware", "0.13.1"
gem "faraday-cookie_jar", "0.0.6"
@ -189,11 +189,11 @@ gem "typhoeus", "1.3.1"
# Views
gem "gon", "6.2.1"
gem "hamlit", "2.9.3"
gem "gon", "6.3.2"
gem "hamlit", "2.11.0"
gem "mobile-fu", "1.4.0"
gem "rails-timeago", "2.17.1"
gem "will_paginate", "3.1.7"
gem "rails-timeago", "2.18.0"
gem "will_paginate", "3.3.0"
# Logging
@ -210,7 +210,7 @@ gem "rubyzip", "1.3.0", require: "zip"
# https://github.com/discourse/discourse/pull/238
gem "minitest"
gem "versionist", "2.0.0"
gem "versionist", "2.0.1"
# Windows and OSX have an execjs compatible runtime built-in, Linux users should
# install Node.js or use "therubyracer".
@ -236,30 +236,30 @@ group :production do # we don"t install these on travis to speed up test runs
# Third party asset hosting
gem "asset_sync", "2.7.0", require: false
gem "asset_sync", "2.11.0", require: false
end
group :development do
# Automatic test runs
gem "guard", "2.15.0", require: false
gem "guard", "2.16.1", require: false
gem "guard-rspec", "4.7.3", require: false
gem "guard-rubocop", "1.3.0", require: false
gem "rb-fsevent", "0.10.3", require: false
gem "rb-inotify", "0.10.0", require: false
gem "rb-inotify", "0.10.1", require: false
# Linters
gem "haml_lint", "0.28.0", require: false
gem "haml_lint", "0.35.0", require: false
gem "pronto", "0.10.0", require: false
gem "pronto-eslint", "0.10.0", require: false
gem "pronto-haml", "0.10.0", require: false
gem "pronto-rubocop", "0.10.0", require: false
gem "pronto-scss", "0.10.0", require: false
gem "rubocop", "0.72.0", require: false
gem "rubocop-rails", "2.1.0", require: false
gem "rubocop", "0.80.1", require: false
gem "rubocop-rails", "2.4.1", require: false
# Preloading environment
gem "spring", "2.0.2"
gem "spring", "2.1.0"
gem "spring-commands-rspec", "1.0.4"
gem "spring-commands-cucumber", "1.0.1"
@ -276,25 +276,25 @@ end
group :test do
# RSpec (unit tests, some integration tests)
gem "fixture_builder", "0.5.2.rc3"
gem "fuubar", "2.4.1"
gem "fixture_builder", "0.5.2"
gem "fuubar", "2.5.0"
gem "json-schema-rspec", "0.0.4"
gem "rspec-json_expectations", "~> 2.1"
# Cucumber (integration tests)
gem "capybara", "3.15.0"
gem "database_cleaner", "1.7.0"
gem "database_cleaner", "1.8.3"
gem "poltergeist", "1.18.1"
gem "cucumber-api-steps", "0.14", require: false
# General helpers
gem "factory_girl_rails", "4.8.0"
gem "factory_girl_rails", "4.9.0"
gem "shoulda-matchers", "4.0.1"
gem "timecop", "0.9.1"
gem "webmock", "3.6.0", require: false
gem "webmock", "3.8.3", require: false
gem "diaspora_federation-test", "0.2.6"
@ -304,13 +304,13 @@ end
group :development, :test do
# RSpec (unit tests, some integration tests)
gem "rspec-rails", "3.8.2"
gem "rspec-rails", "3.9.1"
# Cucumber (integration tests)
gem "cucumber-rails", "1.7.0", require: false
gem "cucumber-rails", "2.0.0", require: false
# Jasmine (client side application tests (JS))
gem "jasmine", "3.4.0"
gem "jasmine", "3.5.1"
gem "jasmine-jquery-rails", "2.0.3"
gem "rails-assets-jasmine-ajax", "4.0.0", source: "https://gems.diasporafoundation.org"
gem "sinon-rails", "1.15.0"

421
Gemfile.lock
View file

@ -2,25 +2,25 @@ GEM
remote: https://rubygems.org/
remote: https://gems.diasporafoundation.org/
specs:
actioncable (5.2.4.1)
actionpack (= 5.2.4.1)
actioncable (5.2.4.2)
actionpack (= 5.2.4.2)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.4.1)
actionpack (= 5.2.4.1)
actionview (= 5.2.4.1)
activejob (= 5.2.4.1)
actionmailer (5.2.4.2)
actionpack (= 5.2.4.2)
actionview (= 5.2.4.2)
activejob (= 5.2.4.2)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.4.1)
actionview (= 5.2.4.1)
activesupport (= 5.2.4.1)
actionpack (5.2.4.2)
actionview (= 5.2.4.2)
activesupport (= 5.2.4.2)
rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.4.1)
activesupport (= 5.2.4.1)
actionview (5.2.4.2)
activesupport (= 5.2.4.2)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
@ -28,37 +28,37 @@ GEM
active_model_serializers (0.9.7)
activemodel (>= 3.2)
concurrent-ruby (~> 1.0)
activejob (5.2.4.1)
activesupport (= 5.2.4.1)
activejob (5.2.4.2)
activesupport (= 5.2.4.2)
globalid (>= 0.3.6)
activemodel (5.2.4.1)
activesupport (= 5.2.4.1)
activerecord (5.2.4.1)
activemodel (= 5.2.4.1)
activesupport (= 5.2.4.1)
activemodel (5.2.4.2)
activesupport (= 5.2.4.2)
activerecord (5.2.4.2)
activemodel (= 5.2.4.2)
activesupport (= 5.2.4.2)
arel (>= 9.0)
activerecord-import (1.0.2)
activerecord-import (1.0.4)
activerecord (>= 3.2)
activestorage (5.2.4.1)
actionpack (= 5.2.4.1)
activerecord (= 5.2.4.1)
activestorage (5.2.4.2)
actionpack (= 5.2.4.2)
activerecord (= 5.2.4.2)
marcel (~> 0.3.1)
activesupport (5.2.4.1)
activesupport (5.2.4.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
acts-as-taggable-on (6.0.0)
activerecord (~> 5.0)
acts-as-taggable-on (6.5.0)
activerecord (>= 5.0, < 6.1)
acts_as_api (1.0.1)
activemodel (>= 3.0.0)
activesupport (>= 3.0.0)
rack (>= 1.1.0)
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
aes_key_wrap (1.0.1)
arel (9.0.0)
asset_sync (2.7.0)
asset_sync (2.11.0)
activemodel (>= 4.1.0)
fog-core
mime-types (>= 2.99)
@ -73,16 +73,16 @@ GEM
babel-transpiler (0.7.0)
babel-source (>= 4.0, < 6)
execjs (~> 2.0)
backports (3.15.0)
backports (3.17.0)
bcrypt (3.1.13)
bindata (2.4.4)
bindata (2.4.6)
bootstrap-sass (3.4.1)
autoprefixer-rails (>= 5.2.1)
sassc (>= 2.0.0)
bootstrap-switch-rails (3.3.3)
buftok (0.2.0)
builder (3.2.4)
byebug (11.0.1)
byebug (11.1.1)
capybara (3.15.0)
addressable
mini_mime (>= 0.1.3)
@ -164,15 +164,15 @@ GEM
cucumber-tag_expressions (~> 1.1.0)
gherkin (~> 5.0)
cucumber-expressions (6.0.1)
cucumber-rails (1.7.0)
capybara (>= 2.3.0, < 4)
cucumber-rails (2.0.0)
capybara (>= 2.12, < 4)
cucumber (>= 3.0.2, < 4)
mime-types (>= 1.17, < 4)
mime-types (>= 2.0, < 4)
nokogiri (~> 1.8)
railties (>= 4.2, < 7)
cucumber-tag_expressions (1.1.1)
cucumber-wire (0.0.1)
database_cleaner (1.7.0)
database_cleaner (1.8.3)
devise (4.7.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
@ -204,7 +204,7 @@ GEM
uuid (~> 2.3, >= 2.3.8)
diff-lcs (1.3)
docile (1.3.2)
domain_name (0.5.20180417)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
encryptor (3.0.0)
entypo-rails (3.0.0)
@ -215,11 +215,11 @@ GEM
execjs
multi_json (>= 1.3)
rake
et-orbi (1.2.1)
et-orbi (1.2.4)
tzinfo
ethon (0.12.0)
ffi (>= 1.3.0)
excon (0.72.0)
excon (0.73.0)
execjs (2.7.0)
eye (0.10.0)
celluloid (~> 0.17.3)
@ -227,11 +227,11 @@ GEM
kostya-sigar (~> 2.0.0)
state_machines
thor
fabrication (2.20.2)
factory_girl (4.8.0)
fabrication (2.21.0)
factory_girl (4.9.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.8.0)
factory_girl (~> 4.8.0)
factory_girl_rails (4.9.0)
factory_girl (~> 4.9.0)
railties (>= 3.0.0)
faraday (0.15.4)
multipart-post (>= 1.2, < 3)
@ -240,19 +240,22 @@ GEM
http-cookie (~> 1.0.0)
faraday_middleware (0.13.1)
faraday (>= 0.7.4, < 1.0)
ffi (1.11.1)
fixture_builder (0.5.2.rc3)
ffi (1.12.2)
ffi-compiler (1.0.1)
ffi (>= 1.0.0)
rake
fixture_builder (0.5.2)
activerecord (>= 2)
activesupport (>= 2)
hashdiff
fog-aws (3.5.1)
fog-aws (3.5.2)
fog-core (~> 2.1)
fog-json (~> 1.1)
fog-xml (~> 0.1)
ipaddress (~> 0.8)
fog-core (2.1.2)
fog-core (2.2.0)
builder
excon (~> 0.58)
excon (~> 0.71)
formatador (~> 0.2)
mime-types
fog-json (1.2.0)
@ -262,24 +265,26 @@ GEM
fog-core
nokogiri (>= 1.5.11, < 2.0.0)
formatador (0.2.5)
fugit (1.2.2)
fugit (1.3.3)
et-orbi (~> 1.1, >= 1.1.8)
raabro (~> 1.1)
fuubar (2.4.1)
fuubar (2.5.0)
rspec-core (~> 3.0)
ruby-progressbar (~> 1.4)
get_process_mem (0.2.3)
get_process_mem (0.2.5)
ffi (~> 1.0)
gherkin (5.1.0)
gitlab (4.11.0)
gitlab (4.14.0)
httparty (~> 0.14, >= 0.14.0)
terminal-table (~> 1.5, >= 1.5.1)
globalid (0.4.2)
activesupport (>= 4.2.0)
gon (6.2.1)
actionpack (>= 3.0)
gon (6.3.2)
actionpack (>= 3.0.20)
i18n (>= 0.7)
multi_json
request_store (>= 1.0)
guard (2.15.0)
guard (2.16.1)
formatador (>= 0.2.4)
listen (>= 2.7, < 4.0)
lumberjack (>= 1.0.12, < 2.0)
@ -296,36 +301,37 @@ GEM
guard-rubocop (1.3.0)
guard (~> 2.0)
rubocop (~> 0.20)
haml (5.0.4)
haml (5.1.2)
temple (>= 0.8.0)
tilt
haml_lint (0.28.0)
haml (>= 4.0, < 5.1)
haml_lint (0.35.0)
haml (>= 4.0, < 5.2)
rainbow
rake (>= 10, < 13)
rubocop (>= 0.50.0)
sysexits (~> 1.1)
hamlit (2.9.3)
temple (>= 0.8.0)
hamlit (2.11.0)
temple (>= 0.8.2)
thor
tilt
handlebars_assets (0.23.4)
handlebars_assets (0.23.8)
execjs (~> 2.0)
sprockets (>= 2.0.0)
tilt (>= 1.2)
hashdiff (0.4.0)
hashie (3.6.0)
http (3.3.0)
hashdiff (1.0.1)
hashie (4.1.0)
http (4.3.0)
addressable (~> 2.3)
http-cookie (~> 1.0)
http-form_data (~> 2.0)
http_parser.rb (~> 0.6.0)
http-form_data (~> 2.2)
http-parser (~> 1.2.0)
http-cookie (1.0.3)
domain_name (~> 0.5)
http-form_data (2.1.1)
http-form_data (2.3.0)
http-parser (1.2.1)
ffi-compiler (>= 1.0, < 2.0)
http_accept_language (2.1.1)
http_parser.rb (0.6.0)
httparty (0.17.0)
httparty (0.18.0)
mime-types (~> 3.0)
multi_xml (>= 0.5.2)
httpclient (2.8.3)
@ -339,25 +345,25 @@ GEM
railties (>= 3.0.0)
idn-ruby (0.1.0)
ipaddress (0.8.3)
jaro_winkler (1.5.3)
jasmine (3.4.0)
jasmine-core (~> 3.4.0)
jaro_winkler (1.5.4)
jasmine (3.5.1)
jasmine-core (~> 3.5.0)
phantomjs
rack (>= 1.2.1)
rake
jasmine-core (3.4.0)
jasmine-core (3.5.0)
jasmine-jquery-rails (2.0.3)
jquery-rails (4.3.5)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
js-routes (1.4.7)
js-routes (1.4.9)
railties (>= 4)
sprockets-rails
js_image_paths (0.1.1)
rails (>= 4.0, < 6.0)
sprockets (>= 3.0.0)
json (2.2.0)
json (2.3.0)
json-jwt (1.11.0)
activesupport (>= 4.2)
aes_key_wrap
@ -367,18 +373,17 @@ GEM
json-schema-rspec (0.0.4)
json-schema (~> 2.5)
rspec
jsonpath (1.0.4)
jsonpath (1.0.5)
multi_json
to_regexp (~> 0.2.1)
jwt (2.2.1)
kgio (2.11.2)
kgio (2.11.3)
kostya-sigar (2.0.6)
leaflet-rails (1.5.1)
leaflet-rails (1.6.0)
rails (>= 4.2.0)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
listen (3.2.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
little-plugger (1.1.4)
logging (2.2.2)
little-plugger (~> 1.1)
@ -388,7 +393,7 @@ GEM
loofah (2.4.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lumberjack (1.0.13)
lumberjack (1.2.4)
macaddr (1.7.2)
systemu (~> 2.6.5)
mail (2.7.1)
@ -400,9 +405,9 @@ GEM
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
method_source (0.9.2)
mime-types (3.2.2)
mime-types (3.3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2019.0331)
mime-types-data (3.2019.1009)
mimemagic (0.3.4)
mini_magick (4.10.1)
mini_mime (1.0.2)
@ -411,30 +416,31 @@ GEM
mobile-fu (1.4.0)
rack-mobile-detect
rails
multi_json (1.13.1)
multi_json (1.14.1)
multi_test (0.1.2)
multi_xml (0.6.0)
multipart-post (2.1.1)
mysql2 (0.5.2)
mysql2 (0.5.3)
naught (1.1.0)
nenv (0.3.0)
nio4r (2.5.2)
nokogiri (1.10.8)
nokogiri (1.10.9)
mini_portile2 (~> 2.4.0)
notiffany (0.1.1)
notiffany (0.1.3)
nenv (~> 0.1)
shellany (~> 0.0)
oauth (0.5.4)
oauth2 (1.4.1)
faraday (>= 0.8, < 0.16.0)
oauth2 (1.4.4)
faraday (>= 0.8, < 2.0)
jwt (>= 1.0, < 3.0)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
octokit (4.14.0)
octokit (4.17.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
omniauth (1.9.0)
hashie (>= 3.4.6, < 3.7.0)
omniauth (1.9.1)
hashie (>= 3.4.6)
rack (>= 1.6.2, < 3)
omniauth-oauth (1.1.0)
oauth
@ -464,10 +470,10 @@ GEM
validate_url
webfinger (>= 1.0.1)
orm_adapter (0.5.0)
parallel (1.17.0)
parser (2.6.3.0)
parallel (1.19.1)
parser (2.7.0.4)
ast (~> 2.4.0)
pg (1.1.4)
pg (1.2.3)
phantomjs (2.1.1.0)
poltergeist (1.18.1)
capybara (>= 2.1, < 4)
@ -495,12 +501,12 @@ GEM
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry-byebug (3.7.0)
pry-byebug (3.8.0)
byebug (~> 11.0)
pry (~> 0.10)
public_suffix (3.1.1)
public_suffix (4.0.3)
raabro (1.1.6)
rack (2.2.2)
rack (2.0.9)
rack-cors (1.1.1)
rack (>= 2.0.0)
rack-google-analytics (1.2.0)
@ -508,32 +514,32 @@ GEM
activesupport
rack-mobile-detect (0.4.0)
rack
rack-oauth2 (1.10.0)
rack-oauth2 (1.10.1)
activesupport
attr_required
httpclient
json-jwt (>= 1.9.0)
json-jwt (>= 1.11.0)
rack
rack-piwik (0.3.0)
rack-protection (2.0.5)
rack-protection (2.0.8.1)
rack
rack-rewrite (1.5.1)
rack-ssl (1.4.1)
rack
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.4.1)
actioncable (= 5.2.4.1)
actionmailer (= 5.2.4.1)
actionpack (= 5.2.4.1)
actionview (= 5.2.4.1)
activejob (= 5.2.4.1)
activemodel (= 5.2.4.1)
activerecord (= 5.2.4.1)
activestorage (= 5.2.4.1)
activesupport (= 5.2.4.1)
rails (5.2.4.2)
actioncable (= 5.2.4.2)
actionmailer (= 5.2.4.2)
actionpack (= 5.2.4.2)
actionview (= 5.2.4.2)
activejob (= 5.2.4.2)
activemodel (= 5.2.4.2)
activerecord (= 5.2.4.2)
activestorage (= 5.2.4.2)
activesupport (= 5.2.4.2)
bundler (>= 1.3.0)
railties (= 5.2.4.1)
railties (= 5.2.4.2)
sprockets-rails (>= 2.0.0)
rails-assets-autosize (4.0.2)
rails-assets-backbone (1.3.3)
@ -582,69 +588,72 @@ GEM
rails-i18n (5.1.3)
i18n (>= 0.7, < 2)
railties (>= 5.0, < 6)
rails-timeago (2.17.1)
rails-timeago (2.18.0)
actionpack (>= 3.1)
activesupport (>= 3.1)
railties (5.2.4.1)
actionpack (= 5.2.4.1)
activesupport (= 5.2.4.1)
railties (5.2.4.2)
actionpack (= 5.2.4.2)
activesupport (= 5.2.4.2)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rainbow (3.0.0)
raindrops (0.19.0)
raindrops (0.19.1)
rake (12.3.3)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
rb-inotify (0.10.1)
ffi (~> 1.0)
redcarpet (3.4.0)
redcarpet (3.5.0)
redis (3.3.5)
regexp_parser (1.5.1)
request_store (1.4.1)
regexp_parser (1.7.0)
request_store (1.5.0)
rack (>= 1.4)
responders (2.4.1)
actionpack (>= 4.2.0, < 6.0)
railties (>= 4.2.0, < 6.0)
rexml (3.2.4)
rotp (2.1.2)
rqrcode (0.10.1)
rqrcode (1.1.2)
chunky_png (~> 1.0)
rspec (3.8.0)
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
rspec-mocks (~> 3.8.0)
rspec-core (3.8.2)
rspec-support (~> 3.8.0)
rspec-expectations (3.8.4)
rqrcode_core (~> 0.1)
rqrcode_core (0.1.2)
rspec (3.9.0)
rspec-core (~> 3.9.0)
rspec-expectations (~> 3.9.0)
rspec-mocks (~> 3.9.0)
rspec-core (3.9.1)
rspec-support (~> 3.9.1)
rspec-expectations (3.9.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
rspec-support (~> 3.9.0)
rspec-json_expectations (2.2.0)
rspec-mocks (3.8.1)
rspec-mocks (3.9.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
rspec-rails (3.8.2)
rspec-support (~> 3.9.0)
rspec-rails (3.9.1)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
rspec-mocks (~> 3.8.0)
rspec-support (~> 3.8.0)
rspec-support (3.8.2)
rubocop (0.72.0)
rspec-core (~> 3.9.0)
rspec-expectations (~> 3.9.0)
rspec-mocks (~> 3.9.0)
rspec-support (~> 3.9.0)
rspec-support (3.9.2)
rubocop (0.80.1)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.6)
parser (>= 2.7.0.1)
rainbow (>= 2.2.2, < 4.0)
rexml
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.7)
rubocop-rails (2.1.0)
rubocop-rails (2.4.1)
rack (>= 1.1)
rubocop (>= 0.72.0)
ruby-oembed (0.12.0)
ruby-progressbar (1.10.1)
ruby_dep (1.5.0)
rubyzip (1.3.0)
rugged (0.28.2)
rugged (0.99.0)
safe_yaml (1.0.5)
sass (3.4.25)
sass-rails (5.0.7)
@ -653,9 +662,8 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
sassc (2.0.1)
sassc (2.2.1)
ffi (~> 1.9)
rake
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
@ -666,15 +674,15 @@ GEM
shellany (0.0.1)
shoulda-matchers (4.0.1)
activesupport (>= 4.2.0)
sidekiq (5.2.7)
sidekiq (5.2.8)
connection_pool (~> 2.2, >= 2.2.2)
rack (>= 1.5.0)
rack (< 2.1.0)
rack-protection (>= 1.5.0)
redis (>= 3.3.5, < 5)
sidekiq-cron (1.1.0)
fugit (~> 1.1)
sidekiq (>= 4.2.1)
simple_captcha2 (0.4.3)
simple_captcha2 (0.5.0)
rails (>= 4.1)
simple_oauth (0.3.1)
simplecov (0.16.1)
@ -684,8 +692,7 @@ GEM
simplecov-html (0.10.2)
sinon-rails (1.15.0)
railties (>= 3.1)
spring (2.0.2)
activesupport (>= 4.2)
spring (2.1.0)
spring-commands-cucumber (1.0.1)
spring (>= 0.9.1)
spring-commands-rspec (1.0.4)
@ -702,31 +709,33 @@ GEM
activesupport (>= 4.0)
sprockets (>= 3.0.0)
state_machines (0.5.0)
string-direction (1.2.1)
string-direction (1.2.2)
swd (1.1.2)
activesupport (>= 3)
attr_required (>= 0.0.5)
httpclient (>= 2.4)
sync (0.5.0)
sysexits (1.2.0)
systemu (2.6.5)
temple (0.8.1)
temple (0.8.2)
term-ansicolor (1.7.1)
tins (~> 1.0)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
thor (0.20.3)
thread_safe (0.3.6)
tilt (2.0.9)
tilt (2.0.10)
timecop (0.9.1)
timers (4.3.0)
tins (1.20.3)
tins (1.24.1)
sync
to_regexp (0.2.1)
turbo_dev_assets (0.0.2)
twitter (6.2.0)
twitter (7.0.0)
addressable (~> 2.3)
buftok (~> 0.2.0)
equalizer (~> 0.0.11)
http (~> 3.0)
http (~> 4.0)
http-form_data (~> 2.0)
http_parser.rb (~> 0.6.0)
memoizable (~> 0.4.0)
@ -740,13 +749,13 @@ GEM
ethon (>= 0.9.0)
tzinfo (1.2.6)
thread_safe (~> 0.1)
uglifier (4.1.20)
uglifier (4.2.0)
execjs (>= 0.3.0, < 3)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.6)
unicode-display_width (1.6.0)
unicorn (5.5.1)
unicode-display_width (1.6.1)
unicorn (5.5.3)
kgio (~> 2.6)
raindrops (~> 0.7)
unicorn-worker-killer (0.4.4)
@ -761,38 +770,38 @@ GEM
validate_url (1.0.8)
activemodel (>= 3.0.0)
public_suffix
versionist (2.0.0)
versionist (2.0.1)
activesupport (>= 3)
railties (>= 3)
yard (~> 0.9.11)
yard (~> 0.9.20)
warden (1.2.8)
rack (>= 2.0.6)
webfinger (1.1.0)
activesupport
httpclient (>= 2.4)
webmock (3.6.0)
webmock (3.8.3)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
websocket-driver (0.7.1)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.4)
will_paginate (3.1.7)
will_paginate (3.3.0)
xpath (3.2.0)
nokogiri (~> 1.8)
yajl-ruby (1.4.1)
yard (0.9.20)
yard (0.9.24)
PLATFORMS
ruby
DEPENDENCIES
active_model_serializers (= 0.9.7)
activerecord-import (= 1.0.2)
acts-as-taggable-on (= 6.0.0)
activerecord-import (= 1.0.4)
acts-as-taggable-on (= 6.5.0)
acts_as_api (= 1.0.1)
addressable (= 2.6.0)
asset_sync (= 2.7.0)
addressable (= 2.7.0)
asset_sync (= 2.11.0)
autoprefixer-rails (= 8.6.5)
bootstrap-sass (= 3.4.1)
bootstrap-switch-rails (= 3.3.3)
@ -802,8 +811,8 @@ DEPENDENCIES
configurate (= 0.3.1)
coveralls (= 0.8.23)
cucumber-api-steps (= 0.14)
cucumber-rails (= 1.7.0)
database_cleaner (= 1.7.0)
cucumber-rails (= 2.0.0)
database_cleaner (= 1.8.3)
devise (= 4.7.1)
devise-two-factor (= 3.0.3)
devise_lastseenable (= 0.0.6)
@ -812,46 +821,46 @@ DEPENDENCIES
diaspora_federation-test (= 0.2.6)
entypo-rails (= 3.0.0)
eye (= 0.10.0)
factory_girl_rails (= 4.8.0)
factory_girl_rails (= 4.9.0)
faraday (= 0.15.4)
faraday-cookie_jar (= 0.0.6)
faraday_middleware (= 0.13.1)
fixture_builder (= 0.5.2.rc3)
fog-aws (= 3.5.1)
fuubar (= 2.4.1)
gon (= 6.2.1)
guard (= 2.15.0)
fixture_builder (= 0.5.2)
fog-aws (= 3.5.2)
fuubar (= 2.5.0)
gon (= 6.3.2)
guard (= 2.16.1)
guard-rspec (= 4.7.3)
guard-rubocop (= 1.3.0)
haml_lint (= 0.28.0)
hamlit (= 2.9.3)
handlebars_assets (= 0.23.4)
haml_lint (= 0.35.0)
hamlit (= 2.11.0)
handlebars_assets (= 0.23.8)
http_accept_language (= 2.1.1)
i18n-inflector-rails (= 1.0.7)
jasmine (= 3.4.0)
jasmine (= 3.5.1)
jasmine-jquery-rails (= 2.0.3)
jquery-rails (= 4.3.5)
js-routes (= 1.4.7)
js-routes (= 1.4.9)
js_image_paths (= 0.1.1)
json (= 2.2.0)
json (= 2.3.0)
json-schema (= 2.8.1)
json-schema-rspec (= 0.0.4)
leaflet-rails (= 1.5.1)
leaflet-rails (= 1.6.0)
logging-rails (= 0.6.0)
markdown-it-html5-embed (= 1.0.0)
markerb (= 1.1.0)
mini_magick (= 4.10.1)
minitest
mobile-fu (= 1.4.0)
mysql2 (= 0.5.2)
nokogiri (= 1.10.8)
omniauth (= 1.9.0)
mysql2 (= 0.5.3)
nokogiri (= 1.10.9)
omniauth (= 1.9.1)
omniauth-tumblr (= 1.2)
omniauth-twitter (= 1.4.0)
omniauth-wordpress (= 0.2.2)
open_graph_reader (= 0.7.0)
openid_connect (= 1.1.8)
pg (= 1.1.4)
pg (= 1.2.3)
poltergeist (= 1.18.1)
pronto (= 0.10.0)
pronto-eslint (= 0.10.0)
@ -865,7 +874,7 @@ DEPENDENCIES
rack-piwik (= 0.3.0)
rack-rewrite (= 1.5.1)
rack-ssl (= 1.4.1)
rails (= 5.2.4.1)
rails (= 5.2.4.2)
rails-assets-autosize (= 4.0.2)!
rails-assets-backbone (= 1.3.3)!
rails-assets-blueimp-gallery (= 2.33.0)!
@ -891,45 +900,45 @@ DEPENDENCIES
rails-assets-utatti-perfect-scrollbar (= 1.4.0)!
rails-controller-testing (= 1.0.4)
rails-i18n (= 5.1.3)
rails-timeago (= 2.17.1)
rails-timeago (= 2.18.0)
rb-fsevent (= 0.10.3)
rb-inotify (= 0.10.0)
redcarpet (= 3.4.0)
rb-inotify (= 0.10.1)
redcarpet (= 3.5.0)
redis (= 3.3.5)
responders (= 2.4.1)
rqrcode (= 0.10.1)
rqrcode (= 1.1.2)
rspec-json_expectations (~> 2.1)
rspec-rails (= 3.8.2)
rubocop (= 0.72.0)
rubocop-rails (= 2.1.0)
rspec-rails (= 3.9.1)
rubocop (= 0.80.1)
rubocop-rails (= 2.4.1)
ruby-oembed (= 0.12.0)
rubyzip (= 1.3.0)
sass-rails (= 5.0.7)
secure_headers (= 6.3.0)
shoulda-matchers (= 4.0.1)
sidekiq (= 5.2.7)
sidekiq (= 5.2.8)
sidekiq-cron (= 1.1.0)
simple_captcha2 (= 0.4.3)
simple_captcha2 (= 0.5.0)
simplecov (= 0.16.1)
sinon-rails (= 1.15.0)
spring (= 2.0.2)
spring (= 2.1.0)
spring-commands-cucumber (= 1.0.1)
spring-commands-rspec (= 1.0.4)
sprockets-es6 (= 0.9.2)
sprockets-rails (= 3.2.1)
string-direction (= 1.2.1)
string-direction (= 1.2.2)
timecop (= 0.9.1)
turbo_dev_assets (= 0.0.2)
twitter (= 6.2.0)
twitter (= 7.0.0)
twitter-text (= 3.0.0)
typhoeus (= 1.3.1)
uglifier (= 4.1.20)
unicorn (= 5.5.1)
uglifier (= 4.2.0)
unicorn (= 5.5.3)
unicorn-worker-killer (= 0.4.4)
uuid (= 2.3.9)
versionist (= 2.0.0)
webmock (= 3.6.0)
will_paginate (= 3.1.7)
versionist (= 2.0.1)
webmock (= 3.8.3)
will_paginate (= 3.3.0)
yajl-ruby (= 1.4.1)
BUNDLED WITH

2
spec/integration/tag_people_spec.rb
View file

@ -14,7 +14,7 @@ describe TagsController, type: :request do
get "/tags/#{tag}"
expect(response.status).to eq(200)
expect(response.body).to match(/div class="pagination"/)
expect(response.body).to match(/class="pagination"/)
expect(response.body).to match(/href="\/tags\/#{tag}\?page=2"/)
end