Unverified Commit dc7c5ffe authored by Benjamin Neff's avatar Benjamin Neff

Merge branch 'release/0.7.11.0'

parents 663da1ef 5aec9b96
...@@ -18,7 +18,7 @@ Metrics/LineLength: ...@@ -18,7 +18,7 @@ Metrics/LineLength:
# Too short methods lead to extraction of single-use methods, which can make # Too short methods lead to extraction of single-use methods, which can make
# the code easier to read (by naming things), but can also clutter the class # the code easier to read (by naming things), but can also clutter the class
Metrics/MethodLength: Metrics/MethodLength:
Max: 20 Max: 20
# The guiding principle of classes is SRP, SRP can't be accurately measured by LoC # The guiding principle of classes is SRP, SRP can't be accurately measured by LoC
...@@ -26,11 +26,17 @@ Metrics/ClassLength: ...@@ -26,11 +26,17 @@ Metrics/ClassLength:
Max: 1500 Max: 1500
Metrics/ModuleLength: Metrics/ModuleLength:
Max: 1500 Max: 1500
# Raise AbcSize from 15 to 20 # Raise complexity metrics
Metrics/AbcSize: Metrics/AbcSize:
Max: 20 Max: 20
Metrics/CyclomaticComplexity:
Max: 20
Metrics/PerceivedComplexity:
Max: 20
# Some blocks are longer. # Some blocks are longer.
Metrics/BlockLength: Metrics/BlockLength:
ExcludedMethods: ExcludedMethods:
...@@ -88,7 +94,7 @@ Lint/AssignmentInCondition: ...@@ -88,7 +94,7 @@ Lint/AssignmentInCondition:
AllowSafeAssignment: false AllowSafeAssignment: false
# A specialized exception class will take one or more arguments and construct the message from it. # A specialized exception class will take one or more arguments and construct the message from it.
# So both variants make sense. # So both variants make sense.
Style/RaiseArgs: Style/RaiseArgs:
Enabled: false Enabled: false
...@@ -151,11 +157,11 @@ Lint/ShadowingOuterLocalVariable: ...@@ -151,11 +157,11 @@ Lint/ShadowingOuterLocalVariable:
# Check with yard instead. # Check with yard instead.
Style/Documentation: Style/Documentation:
Enabled: false Enabled: false
# This is just silly. Calling the argument `other` in all cases makes no sense. # This is just silly. Calling the argument `other` in all cases makes no sense.
Naming/BinaryOperatorParameterName: Naming/BinaryOperatorParameterName:
Enabled: false Enabled: false
# There are valid cases, for example debugging Cucumber steps, # There are valid cases, for example debugging Cucumber steps,
# also they'll fail CI anyway # also they'll fail CI anyway
......
# 0.7.11.0
## Refactor
* Enable paranoid mode for devise [#8003](https://github.com/diaspora/diaspora/pull/8003)
* Refactor likes cucumber test [#8002](https://github.com/diaspora/diaspora/pull/8002)
## Bug fixes
* Fix old photos without remote url for export [#8012](https://github.com/diaspora/diaspora/pull/8012)
## Features
* Add a manifest.json file as a first step to make diaspora\* a Progressive Web App [#7998](https://github.com/diaspora/diaspora/pull/7998)
* Allow `web+diaspora://` links to link to a profile with only the diaspora ID [#8000](https://github.com/diaspora/diaspora/pull/8000)
* Support TOTP two factor authentication [#7751](https://github.com/diaspora/diaspora/pull/7751)
# 0.7.10.0 # 0.7.10.0
## Refactor ## Refactor
......
...@@ -2,32 +2,34 @@ ...@@ -2,32 +2,34 @@
source "https://rubygems.org" source "https://rubygems.org"
gem "rails", "5.1.6" gem "rails", "5.1.6.2"
# Legacy Rails features, remove me! # Legacy Rails features, remove me!
# responders (class level) # responders (class level)
gem "responders", "2.4.0" gem "responders", "2.4.1"
# Appserver # Appserver
gem "unicorn", "5.4.1", require: false gem "unicorn", "5.5.0", require: false
gem "unicorn-worker-killer", "0.4.4" gem "unicorn-worker-killer", "0.4.4"
# Federation # Federation
gem "diaspora_federation-json_schema", "0.2.5" gem "diaspora_federation-json_schema", "0.2.6"
gem "diaspora_federation-rails", "0.2.5" gem "diaspora_federation-rails", "0.2.6"
# API and JSON # API and JSON
gem "acts_as_api", "1.0.1" gem "acts_as_api", "1.0.1"
gem "json", "2.1.0" gem "json", "2.2.0"
gem "json-schema", "2.8.1" gem "json-schema", "2.8.1"
# Authentication # Authentication
gem "devise", "4.5.0" gem "devise", "4.6.1"
gem "devise-two-factor", "3.0.3"
gem "devise_lastseenable", "0.0.6" gem "devise_lastseenable", "0.0.6"
gem "rqrcode", "0.10.1"
# Captcha # Captcha
...@@ -36,15 +38,15 @@ gem "simple_captcha2", "0.4.3", require: "simple_captcha" ...@@ -36,15 +38,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.2.3" gem "sidekiq", "5.2.5"
# Scheduled processing # Scheduled processing
gem "sidekiq-cron", "1.0.4" gem "sidekiq-cron", "1.1.0"
# Compression # Compression
gem "uglifier", "4.1.19" gem "uglifier", "4.1.20"
# Configuration # Configuration
...@@ -57,7 +59,7 @@ gem "rack-cors", "1.0.2", require: "rack/cors" ...@@ -57,7 +59,7 @@ gem "rack-cors", "1.0.2", require: "rack/cors"
# CSS # CSS
gem "autoprefixer-rails", "8.6.5" gem "autoprefixer-rails", "8.6.5"
gem "bootstrap-sass", "3.3.7" gem "bootstrap-sass", "3.4.1"
gem "bootstrap-switch-rails", "3.3.3" # 3.3.4 is broken, see https://github.com/Bttstrp/bootstrap-switch/issues/691 gem "bootstrap-switch-rails", "3.3.3" # 3.3.4 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"
...@@ -69,17 +71,17 @@ group :mysql, optional: true do ...@@ -69,17 +71,17 @@ group :mysql, optional: true do
gem "mysql2", "0.5.2" gem "mysql2", "0.5.2"
end end
group :postgresql, optional: true do group :postgresql, optional: true do
gem "pg", "1.1.3" gem "pg", "1.1.4"
end end
gem "activerecord-import", "0.27.0" gem "activerecord-import", "1.0.1"
# File uploading # File uploading
gem "carrierwave", "1.2.3" gem "carrierwave", "1.3.1"
gem "fog-aws", "3.3.0" gem "fog-aws", "3.4.0"
gem "mini_magick", "4.9.2" gem "mini_magick", "4.9.3"
# GUID generation # GUID generation
gem "uuid", "2.3.9" gem "uuid", "2.3.9"
...@@ -90,7 +92,7 @@ gem "entypo-rails", "3.0.0" ...@@ -90,7 +92,7 @@ gem "entypo-rails", "3.0.0"
# JavaScript # JavaScript
gem "handlebars_assets", "0.23.2" gem "handlebars_assets", "0.23.3"
gem "jquery-rails", "4.3.3" gem "jquery-rails", "4.3.3"
gem "js-routes", "1.4.4" gem "js-routes", "1.4.4"
gem "js_image_paths", "0.1.1" gem "js_image_paths", "0.1.1"
...@@ -129,7 +131,7 @@ gem "markdown-it-html5-embed", "1.0.0" ...@@ -129,7 +131,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.2" gem "rails-i18n", "5.1.3"
# Mail # Mail
...@@ -140,7 +142,7 @@ gem "leaflet-rails", "1.3.1" ...@@ -140,7 +142,7 @@ gem "leaflet-rails", "1.3.1"
# Parsing # Parsing
gem "nokogiri", "1.8.5" gem "nokogiri", "1.10.1"
gem "open_graph_reader", "0.6.2" # also update User-Agent in features/support/webmock.rb gem "open_graph_reader", "0.6.2" # also update User-Agent in features/support/webmock.rb
gem "redcarpet", "3.4.0" gem "redcarpet", "3.4.0"
gem "ruby-oembed", "0.12.0" gem "ruby-oembed", "0.12.0"
...@@ -152,11 +154,11 @@ gem "string-direction", "1.2.1" ...@@ -152,11 +154,11 @@ gem "string-direction", "1.2.1"
# Security Headers # Security Headers
gem "secure_headers", "6.0.0" gem "secure_headers", "6.1.0"
# Services # Services
gem "omniauth", "1.8.1" gem "omniauth", "1.9.0"
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"
...@@ -180,7 +182,7 @@ gem "acts-as-taggable-on", "6.0.0" ...@@ -180,7 +182,7 @@ 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.15.3" gem "faraday", "0.15.4"
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.1" gem "typhoeus", "1.3.1"
...@@ -188,10 +190,10 @@ gem "typhoeus", "1.3.1" ...@@ -188,10 +190,10 @@ gem "typhoeus", "1.3.1"
# Views # Views
gem "gon", "6.2.1" gem "gon", "6.2.1"
gem "hamlit", "2.9.1" gem "hamlit", "2.9.2"
gem "mobile-fu", "1.4.0" gem "mobile-fu", "1.4.0"
gem "rails-timeago", "2.16.0" gem "rails-timeago", "2.17.1"
gem "will_paginate", "3.1.6" gem "will_paginate", "3.1.7"
# Logging # Logging
...@@ -234,7 +236,7 @@ group :production do # we don"t install these on travis to speed up test runs ...@@ -234,7 +236,7 @@ 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.5.0", require: false gem "asset_sync", "2.7.0", require: false
end end
group :development do group :development do
...@@ -243,7 +245,7 @@ group :development do ...@@ -243,7 +245,7 @@ group :development do
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
gem "rb-fsevent", "0.10.3", require: false gem "rb-fsevent", "0.10.3", require: false
gem "rb-inotify", "0.9.10", require: false gem "rb-inotify", "0.10.0", require: false
# Linters # Linters
gem "haml_lint", "0.28.0", require: false gem "haml_lint", "0.28.0", require: false
...@@ -252,7 +254,7 @@ group :development do ...@@ -252,7 +254,7 @@ group :development do
gem "pronto-haml", "0.9.0", require: false gem "pronto-haml", "0.9.0", require: false
gem "pronto-rubocop", "0.9.1", 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.60.0", require: false gem "rubocop", "0.66.0", require: false
# Preloading environment # Preloading environment
...@@ -280,7 +282,7 @@ group :test do ...@@ -280,7 +282,7 @@ group :test do
# Cucumber (integration tests) # Cucumber (integration tests)
gem "capybara", "3.11.1" gem "capybara", "3.15.0"
gem "database_cleaner", "1.7.0" gem "database_cleaner", "1.7.0"
gem "poltergeist", "1.18.1" gem "poltergeist", "1.18.1"
...@@ -289,11 +291,11 @@ group :test do ...@@ -289,11 +291,11 @@ group :test do
# General helpers # General helpers
gem "factory_girl_rails", "4.8.0" gem "factory_girl_rails", "4.8.0"
gem "shoulda-matchers", "3.1.2" gem "shoulda-matchers", "4.0.1"
gem "timecop", "0.9.1" gem "timecop", "0.9.1"
gem "webmock", "3.4.2", require: false gem "webmock", "3.5.1", require: false
gem "diaspora_federation-test", "0.2.5" gem "diaspora_federation-test", "0.2.6"
# Coverage # Coverage
gem "coveralls", "0.8.22", require: false gem "coveralls", "0.8.22", require: false
...@@ -301,7 +303,7 @@ end ...@@ -301,7 +303,7 @@ 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.8.1" gem "rspec-rails", "3.8.2"
# Cucumber (integration tests) # Cucumber (integration tests)
gem "cucumber-rails", "1.6.0", require: false gem "cucumber-rails", "1.6.0", require: false
...@@ -313,5 +315,5 @@ group :development, :test do ...@@ -313,5 +315,5 @@ group :development, :test do
gem "sinon-rails", "1.15.0" gem "sinon-rails", "1.15.0"
# For `assigns` in controller specs # For `assigns` in controller specs
gem "rails-controller-testing", "1.0.2" gem "rails-controller-testing", "1.0.4"
end end
...@@ -2,25 +2,25 @@ GEM ...@@ -2,25 +2,25 @@ GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
remote: https://rails-assets.org/ remote: https://rails-assets.org/
specs: specs:
actioncable (5.1.6) actioncable (5.1.6.2)
actionpack (= 5.1.6) actionpack (= 5.1.6.2)
nio4r (~> 2.0) nio4r (~> 2.0)
websocket-driver (~> 0.6.1) websocket-driver (~> 0.6.1)
actionmailer (5.1.6) actionmailer (5.1.6.2)
actionpack (= 5.1.6) actionpack (= 5.1.6.2)
actionview (= 5.1.6) actionview (= 5.1.6.2)
activejob (= 5.1.6) activejob (= 5.1.6.2)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
actionpack (5.1.6) actionpack (5.1.6.2)
actionview (= 5.1.6) actionview (= 5.1.6.2)
activesupport (= 5.1.6) activesupport (= 5.1.6.2)
rack (~> 2.0) rack (~> 2.0)
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.1.6) actionview (5.1.6.2)
activesupport (= 5.1.6) activesupport (= 5.1.6.2)
builder (~> 3.1) builder (~> 3.1)
erubi (~> 1.4) erubi (~> 1.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
...@@ -28,18 +28,18 @@ GEM ...@@ -28,18 +28,18 @@ GEM
active_model_serializers (0.9.7) active_model_serializers (0.9.7)
activemodel (>= 3.2) activemodel (>= 3.2)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
activejob (5.1.6) activejob (5.1.6.2)
activesupport (= 5.1.6) activesupport (= 5.1.6.2)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (5.1.6) activemodel (5.1.6.2)
activesupport (= 5.1.6) activesupport (= 5.1.6.2)
activerecord (5.1.6) activerecord (5.1.6.2)
activemodel (= 5.1.6) activemodel (= 5.1.6.2)
activesupport (= 5.1.6) activesupport (= 5.1.6.2)
arel (~> 8.0) arel (~> 8.0)
activerecord-import (0.27.0) activerecord-import (1.0.1)
activerecord (>= 3.2) activerecord (>= 3.2)
activesupport (5.1.6) activesupport (5.1.6.2)
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)
...@@ -54,26 +54,28 @@ GEM ...@@ -54,26 +54,28 @@ 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.5.0) asset_sync (2.7.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_encrypted (3.1.0)
encryptor (~> 3.0.0)
attr_required (1.0.1) attr_required (1.0.1)
autoprefixer-rails (8.6.5) autoprefixer-rails (8.6.5)
execjs execjs
backports (3.11.4) backports (3.12.0)
bcrypt (3.1.12) bcrypt (3.1.12)
bindata (2.4.4) bindata (2.4.4)
bootstrap-sass (3.3.7) bootstrap-sass (3.4.1)
autoprefixer-rails (>= 5.2.1) autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4) sassc (>= 2.0.0)
bootstrap-switch-rails (3.3.3) bootstrap-switch-rails (3.3.3)
buftok (0.2.0) buftok (0.2.0)
builder (3.2.3) builder (3.2.3)
byebug (10.0.2) byebug (11.0.1)
capybara (3.11.1) capybara (3.15.0)
addressable addressable
mini_mime (>= 0.1.3) mini_mime (>= 0.1.3)
nokogiri (~> 1.8) nokogiri (~> 1.8)
...@@ -81,11 +83,11 @@ GEM ...@@ -81,11 +83,11 @@ GEM
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
regexp_parser (~> 1.2) regexp_parser (~> 1.2)
xpath (~> 3.2) xpath (~> 3.2)
carrierwave (1.2.3) carrierwave (1.3.1)
activemodel (>= 4.0.0) activemodel (>= 4.0.0)
activesupport (>= 4.0.0) activesupport (>= 4.0.0)
mime-types (>= 1.16) mime-types (>= 1.16)
celluloid (0.17.3) celluloid (0.17.4)
celluloid-essentials celluloid-essentials
celluloid-extras celluloid-extras
celluloid-fsm celluloid-fsm
...@@ -106,7 +108,7 @@ GEM ...@@ -106,7 +108,7 @@ GEM
timers (>= 4.1.1) timers (>= 4.1.1)
celluloid-supervision (0.20.6) celluloid-supervision (0.20.6)
timers (>= 4.1.1) timers (>= 4.1.1)
chunky_png (1.3.10) chunky_png (1.3.11)
cliver (0.3.2) cliver (0.3.2)
coderay (1.1.2) coderay (1.1.2)
compass (1.0.3) compass (1.0.3)
...@@ -125,7 +127,7 @@ GEM ...@@ -125,7 +127,7 @@ GEM
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.1.3) concurrent-ruby (1.1.5)
configurate (0.3.1) configurate (0.3.1)
connection_pool (2.2.2) connection_pool (2.2.2)
coveralls (0.8.22) coveralls (0.8.22)
...@@ -163,45 +165,52 @@ GEM ...@@ -163,45 +165,52 @@ GEM
cucumber-tag_expressions (1.1.1) cucumber-tag_expressions (1.1.1)
cucumber-wire (0.0.1) cucumber-wire (0.0.1)
database_cleaner (1.7.0) database_cleaner (1.7.0)
devise (4.5.0) devise (4.6.1)
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)
responders responders
warden (~> 1.2.3) warden (~> 1.2.3)
devise-two-factor (3.0.3)
activesupport (< 5.3)
attr_encrypted (>= 1.3, < 4, != 2)
devise (~> 4.0)
railties (< 5.3)
rotp (~> 2.0)
devise_lastseenable (0.0.6) devise_lastseenable (0.0.6)
devise devise
rails (>= 3.0.4) rails (>= 3.0.4)
diaspora-prosody-config (0.0.7) diaspora-prosody-config (0.0.7)
diaspora_federation (0.2.5) diaspora_federation (0.2.6)
faraday (>= 0.9.0, < 0.16.0) faraday (>= 0.9.0, < 0.16.0)
faraday_middleware (>= 0.10.0, < 0.13.0) faraday_middleware (>= 0.10.0, < 0.14.0)
nokogiri (~> 1.6, >= 1.6.8) nokogiri (~> 1.6, >= 1.6.8)
typhoeus (~> 1.0) typhoeus (~> 1.0)
valid (~> 1.0) valid (~> 1.0)
diaspora_federation-json_schema (0.2.5) diaspora_federation-json_schema (0.2.6)
diaspora_federation-rails (0.2.5) diaspora_federation-rails (0.2.6)
actionpack (>= 4.2, < 6) actionpack (>= 4.2, < 6)
diaspora_federation (= 0.2.5) diaspora_federation (= 0.2.6)
diaspora_federation-test (0.2.5) diaspora_federation-test (0.2.6)
diaspora_federation (= 0.2.5) diaspora_federation (= 0.2.6)
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.3.1) docile (1.3.1)
domain_name (0.5.20180417) domain_name (0.5.20180417)
unf (>= 0.0.5, < 1.0.0) unf (>= 0.0.5, < 1.0.0)
encryptor (3.0.0)
entypo-rails (3.0.0) entypo-rails (3.0.0)
railties (>= 4.1, < 6) railties (>= 4.1, < 6)
equalizer (0.0.11) equalizer (0.0.11)
erubi (1.7.1) erubi (1.8.0)
eslintrb (2.1.0) eslintrb (2.1.0)