Merge branch 'release/0.7.11.0'

.rubocop.yml

@@ -18,19 +18,25 @@ Metrics/LineLength:
 
 # 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
-Metrics/MethodLength: 
+Metrics/MethodLength:
   Max: 20
 
 # The guiding principle of classes is SRP, SRP can't be accurately measured by LoC
 Metrics/ClassLength:
   Max: 1500
 Metrics/ModuleLength:
   Max: 1500
-  
-# Raise AbcSize from 15 to 20
+
+# Raise complexity metrics
 Metrics/AbcSize:
   Max: 20
 
+Metrics/CyclomaticComplexity:
+  Max: 20
+
+Metrics/PerceivedComplexity:
+  Max: 20
+
 # Some blocks are longer.
 Metrics/BlockLength:
   ExcludedMethods:
@@ -88,7 +94,7 @@ Lint/AssignmentInCondition:
   AllowSafeAssignment: false
 
 # 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:
   Enabled: false
 
@@ -151,11 +157,11 @@ Lint/ShadowingOuterLocalVariable:
 
 # Check with yard instead.
 Style/Documentation:
-  Enabled: false 
+  Enabled: false
 
 # This is just silly. Calling the argument `other` in all cases makes no sense.
 Naming/BinaryOperatorParameterName:
-  Enabled: false 
+  Enabled: false
 
 # There are valid cases, for example debugging Cucumber steps,
 # also they'll fail CI anyway

Changelog.md

@@ -1,3 +1,17 @@
+# 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
 
 ## Refactor

Gemfile

@@ -2,32 +2,34 @@
 
 source "https://rubygems.org"
 
-gem "rails", "5.1.6"
+gem "rails", "5.1.6.2"
 
 # Legacy Rails features, remove me!
 # responders (class level)
-gem "responders", "2.4.0"
+gem "responders", "2.4.1"
 
 # Appserver
 
-gem "unicorn", "5.4.1", require: false
+gem "unicorn", "5.5.0", require: false
 gem "unicorn-worker-killer", "0.4.4"
 
 # Federation
 
-gem "diaspora_federation-json_schema", "0.2.5"
-gem "diaspora_federation-rails", "0.2.5"
+gem "diaspora_federation-json_schema", "0.2.6"
+gem "diaspora_federation-rails", "0.2.6"
 
 # API and JSON
 
 gem "acts_as_api", "1.0.1"
-gem "json",        "2.1.0"
+gem "json",        "2.2.0"
 gem "json-schema", "2.8.1"
 
 # 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 "rqrcode", "0.10.1"
 
 # Captcha
 
@@ -36,15 +38,15 @@ gem "simple_captcha2", "0.4.3", 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.3"
+gem "sidekiq", "5.2.5"
 
 # Scheduled processing
 
-gem "sidekiq-cron", "1.0.4"
+gem "sidekiq-cron", "1.1.0"
 
 # Compression
 
-gem "uglifier", "4.1.19"
+gem "uglifier", "4.1.20"
 
 # Configuration
 
@@ -57,7 +59,7 @@ gem "rack-cors", "1.0.2", require: "rack/cors"
 # CSS
 
 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 "compass-rails",          "3.1.0"
 gem "sass-rails",             "5.0.7"
@@ -69,17 +71,17 @@ group :mysql, optional: true do
   gem "mysql2", "0.5.2"
 end
 group :postgresql, optional: true do
-  gem "pg",     "1.1.3"
+  gem "pg",     "1.1.4"
 end
 
 
-gem "activerecord-import", "0.27.0"
+gem "activerecord-import", "1.0.1"
 
 # File uploading
 
-gem "carrierwave", "1.2.3"
-gem "fog-aws",     "3.3.0"
-gem "mini_magick", "4.9.2"
+gem "carrierwave", "1.3.1"
+gem "fog-aws",     "3.4.0"
+gem "mini_magick", "4.9.3"
 
 # GUID generation
 gem "uuid", "2.3.9"
@@ -90,7 +92,7 @@ gem "entypo-rails", "3.0.0"
 
 # JavaScript
 
-gem "handlebars_assets", "0.23.2"
+gem "handlebars_assets", "0.23.3"
 gem "jquery-rails",      "4.3.3"
 gem "js-routes",         "1.4.4"
 gem "js_image_paths",    "0.1.1"
@@ -129,7 +131,7 @@ gem "markdown-it-html5-embed", "1.0.0"
 
 gem "http_accept_language", "2.1.1"
 gem "i18n-inflector-rails", "1.0.7"
-gem "rails-i18n",           "5.1.2"
+gem "rails-i18n",           "5.1.3"
 
 # Mail
 
@@ -140,7 +142,7 @@ gem "leaflet-rails",       "1.3.1"
 
 # 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 "redcarpet",         "3.4.0"
 gem "ruby-oembed",       "0.12.0"
@@ -152,11 +154,11 @@ gem "string-direction", "1.2.1"
 
 # Security Headers
 
-gem "secure_headers", "6.0.0"
+gem "secure_headers", "6.1.0"
 
 # Services
 
-gem "omniauth",           "1.8.1"
+gem "omniauth",           "1.9.0"
 gem "omniauth-tumblr",    "1.2"
 gem "omniauth-twitter",   "1.4.0"
 gem "omniauth-wordpress", "0.2.2"
@@ -180,18 +182,18 @@ gem "acts-as-taggable-on", "6.0.0"
 # URIs and HTTP
 
 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-cookie_jar", "0.0.6"
 gem "typhoeus",           "1.3.1"
 
 # Views
 
 gem "gon",                     "6.2.1"
-gem "hamlit",                  "2.9.1"
+gem "hamlit",                  "2.9.2"
 gem "mobile-fu",               "1.4.0"
-gem "rails-timeago",           "2.16.0"
-gem "will_paginate",           "3.1.6"
+gem "rails-timeago",           "2.17.1"
+gem "will_paginate",           "3.1.7"
 
 # Logging
 
@@ -234,7 +236,7 @@ group :production do # we don"t install these on travis to speed up test runs
 
   # Third party asset hosting
 
-  gem "asset_sync", "2.5.0", require: false
+  gem "asset_sync", "2.7.0", require: false
 end
 
 group :development do
@@ -243,7 +245,7 @@ group :development do
   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.9.10", require: false
+  gem "rb-inotify",     "0.10.0", require: false
 
   # Linters
   gem "haml_lint",      "0.28.0", require: false
@@ -252,7 +254,7 @@ group :development do
   gem "pronto-haml",    "0.9.0", require: false
   gem "pronto-rubocop", "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
 
@@ -280,7 +282,7 @@ group :test do
 
   # Cucumber (integration tests)
 
-  gem "capybara",           "3.11.1"
+  gem "capybara",           "3.15.0"
   gem "database_cleaner",   "1.7.0"
   gem "poltergeist",        "1.18.1"
 
@@ -289,19 +291,19 @@ group :test do
   # General helpers
 
   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 "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
   gem "coveralls", "0.8.22", require: false
 end
 
 group :development, :test do
   # RSpec (unit tests, some integration tests)
-  gem "rspec-rails", "3.8.1"
+  gem "rspec-rails", "3.8.2"
 
   # Cucumber (integration tests)
   gem "cucumber-rails", "1.6.0", require: false
@@ -313,5 +315,5 @@ group :development, :test do
   gem "sinon-rails",               "1.15.0"
 
   # For `assigns` in controller specs
-  gem "rails-controller-testing", "1.0.2"
+  gem "rails-controller-testing", "1.0.4"
 end