diff --git a/Gemfile b/Gemfile
index c2fbb7574..efc845e99 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,15 +2,15 @@
 
 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
@@ -21,12 +21,12 @@ gem "diaspora_federation-rails", "0.2.5"
 # 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_lastseenable", "0.0.6"
 
 # Captcha
@@ -36,15 +36,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 +57,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 +69,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,11 +90,11 @@ gem "entypo-rails", "3.0.0"
 
 # JavaScript
 
-gem "sprockets-es6",     "0.9.2"
-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"
+gem "sprockets-es6",     "0.9.2"
 
 source "https://rails-assets.org" do
   gem "rails-assets-jquery",                              "3.3.1" # Should be kept in sync with jquery-rails
@@ -132,7 +132,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
 
@@ -143,7 +143,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"
@@ -155,11 +155,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"
@@ -183,7 +183,7 @@ 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"
@@ -191,10 +191,10 @@ 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
 
@@ -237,7 +237,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
@@ -246,7 +246,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
@@ -255,7 +255,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
 
@@ -283,7 +283,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"
 
@@ -292,9 +292,9 @@ 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"
 
@@ -304,7 +304,7 @@ 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
@@ -316,5 +316,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
diff --git a/Gemfile.lock b/Gemfile.lock
index 232f9cd13..0fde9a9d6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,25 +2,25 @@ GEM
   remote: https://rubygems.org/
   remote: https://rails-assets.org/
   specs:
-    actioncable (5.1.6)
-      actionpack (= 5.1.6)
+    actioncable (5.1.6.2)
+      actionpack (= 5.1.6.2)
       nio4r (~> 2.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.1.6)
-      actionpack (= 5.1.6)
-      actionview (= 5.1.6)
-      activejob (= 5.1.6)
+    actionmailer (5.1.6.2)
+      actionpack (= 5.1.6.2)
+      actionview (= 5.1.6.2)
+      activejob (= 5.1.6.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.1.6)
-      actionview (= 5.1.6)
-      activesupport (= 5.1.6)
+    actionpack (5.1.6.2)
+      actionview (= 5.1.6.2)
+      activesupport (= 5.1.6.2)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.6)
-      activesupport (= 5.1.6)
+    actionview (5.1.6.2)
+      activesupport (= 5.1.6.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -28,18 +28,18 @@ GEM
     active_model_serializers (0.9.7)
       activemodel (>= 3.2)
       concurrent-ruby (~> 1.0)
-    activejob (5.1.6)
-      activesupport (= 5.1.6)
+    activejob (5.1.6.2)
+      activesupport (= 5.1.6.2)
       globalid (>= 0.3.6)
-    activemodel (5.1.6)
-      activesupport (= 5.1.6)
-    activerecord (5.1.6)
-      activemodel (= 5.1.6)
-      activesupport (= 5.1.6)
+    activemodel (5.1.6.2)
+      activesupport (= 5.1.6.2)
+    activerecord (5.1.6.2)
+      activemodel (= 5.1.6.2)
+      activesupport (= 5.1.6.2)
       arel (~> 8.0)
-    activerecord-import (0.27.0)
+    activerecord-import (1.0.1)
       activerecord (>= 3.2)
-    activesupport (5.1.6)
+    activesupport (5.1.6.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -54,7 +54,7 @@ GEM
       public_suffix (>= 2.0.2, < 4.0)
     aes_key_wrap (1.0.1)
     arel (8.0.0)
-    asset_sync (2.5.0)
+    asset_sync (2.7.0)
       activemodel (>= 4.1.0)
       fog-core
       mime-types (>= 2.99)
@@ -67,17 +67,17 @@ GEM
     babel-transpiler (0.7.0)
       babel-source (>= 4.0, < 6)
       execjs (~> 2.0)
-    backports (3.11.4)
+    backports (3.12.0)
     bcrypt (3.1.12)
     bindata (2.4.4)
-    bootstrap-sass (3.3.7)
+    bootstrap-sass (3.4.1)
       autoprefixer-rails (>= 5.2.1)
-      sass (>= 3.3.4)
+      sassc (>= 2.0.0)
     bootstrap-switch-rails (3.3.3)
     buftok (0.2.0)
     builder (3.2.3)
-    byebug (10.0.2)
-    capybara (3.11.1)
+    byebug (11.0.1)
+    capybara (3.15.0)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
@@ -85,11 +85,11 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (~> 1.2)
       xpath (~> 3.2)
-    carrierwave (1.2.3)
+    carrierwave (1.3.1)
       activemodel (>= 4.0.0)
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
-    celluloid (0.17.3)
+    celluloid (0.17.4)
       celluloid-essentials
       celluloid-extras
       celluloid-fsm
@@ -110,7 +110,7 @@ GEM
       timers (>= 4.1.1)
     celluloid-supervision (0.20.6)
       timers (>= 4.1.1)
-    chunky_png (1.3.10)
+    chunky_png (1.3.11)
     cliver (0.3.2)
     coderay (1.1.2)
     compass (1.0.3)
@@ -129,7 +129,7 @@ GEM
       compass (~> 1.0.0)
       sass-rails (< 5.1)
       sprockets (< 4.0)
-    concurrent-ruby (1.1.3)
+    concurrent-ruby (1.1.5)
     configurate (0.3.1)
     connection_pool (2.2.2)
     coveralls (0.8.22)
@@ -167,7 +167,7 @@ GEM
     cucumber-tag_expressions (1.1.1)
     cucumber-wire (0.0.1)
     database_cleaner (1.7.0)
-    devise (4.5.0)
+    devise (4.6.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0, < 6.0)
@@ -198,14 +198,14 @@ GEM
     entypo-rails (3.0.0)
       railties (>= 4.1, < 6)
     equalizer (0.0.11)
-    erubi (1.7.1)
+    erubi (1.8.0)
     eslintrb (2.1.0)
       execjs
       multi_json (>= 1.3)
       rake
-    et-orbi (1.1.6)
+    et-orbi (1.1.7)
       tzinfo
-    ethon (0.11.0)
+    ethon (0.12.0)
       ffi (>= 1.3.0)
     excon (0.62.0)
     execjs (2.7.0)
@@ -221,19 +221,19 @@ GEM
     factory_girl_rails (4.8.0)
       factory_girl (~> 4.8.0)
       railties (>= 3.0.0)
-    faraday (0.15.3)
+    faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     faraday-cookie_jar (0.0.6)
       faraday (>= 0.7.4)
       http-cookie (~> 1.0.0)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
-    ffi (1.9.25)
+    ffi (1.10.0)
     fixture_builder (0.5.2.rc3)
       activerecord (>= 2)
       activesupport (>= 2)
       hashdiff
-    fog-aws (3.3.0)
+    fog-aws (3.4.0)
       fog-core (~> 2.1)
       fog-json (~> 1.1)
       fog-xml (~> 0.1)
@@ -250,18 +250,18 @@ GEM
       fog-core
       nokogiri (>= 1.5.11, < 2.0.0)
     formatador (0.2.5)
-    fugit (1.1.6)
-      et-orbi (~> 1.1, >= 1.1.6)
+    fugit (1.1.8)
+      et-orbi (~> 1.1, >= 1.1.7)
       raabro (~> 1.1)
     fuubar (2.3.2)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
     get_process_mem (0.2.3)
     gherkin (5.1.0)
-    gitlab (4.7.0)
-      httparty (>= 0.14.0)
-      terminal-table (>= 1.5.1)
-    globalid (0.4.1)
+    gitlab (4.10.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)
@@ -293,16 +293,16 @@ GEM
       rake (>= 10, < 13)
       rubocop (>= 0.50.0)
       sysexits (~> 1.1)
-    hamlit (2.9.1)
+    hamlit (2.9.2)
       temple (>= 0.8.0)
       thor
       tilt
-    handlebars_assets (0.23.2)
+    handlebars_assets (0.23.3)
       execjs (~> 2.0)
       sprockets (>= 2.0.0)
       tilt (>= 1.2)
-    hashdiff (0.3.7)
-    hashie (3.5.7)
+    hashdiff (0.3.8)
+    hashie (3.6.0)
     http (3.3.0)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
@@ -313,11 +313,11 @@ GEM
     http-form_data (2.1.1)
     http_accept_language (2.1.1)
     http_parser.rb (0.6.0)
-    httparty (0.16.3)
+    httparty (0.16.4)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
-    i18n (1.1.1)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     i18n-inflector (2.6.7)
       i18n (>= 0.4.1)
@@ -327,7 +327,7 @@ GEM
       railties (>= 3.0.0)
     idn-ruby (0.1.0)
     ipaddress (0.8.3)
-    jaro_winkler (1.5.1)
+    jaro_winkler (1.5.2)
     jasmine (3.3.0)
       jasmine-core (~> 3.3.0)
       phantomjs
@@ -345,9 +345,9 @@ GEM
     js_image_paths (0.1.1)
       rails (>= 4.0, < 6.0)
       sprockets (>= 3.0.0)
-    json (2.1.0)
-    json-jwt (1.9.4)
-      activesupport
+    json (2.2.0)
+    json-jwt (1.10.0)
+      activesupport (>= 4.2)
       aes_key_wrap
       bindata
     json-schema (2.8.1)
@@ -355,12 +355,12 @@ GEM
     json-schema-rspec (0.0.4)
       json-schema (~> 2.5)
       rspec
-    jsonpath (0.9.6)
+    jsonpath (1.0.1)
       multi_json
       to_regexp (~> 0.2.1)
     jwt (2.1.0)
     kgio (2.11.2)
-    kostya-sigar (2.0.4)
+    kostya-sigar (2.0.6)
     leaflet-rails (1.3.1)
       rails (>= 4.2.0)
     listen (3.1.5)
@@ -389,9 +389,9 @@ GEM
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2018.0812)
-    mini_magick (4.9.2)
+    mini_magick (4.9.3)
     mini_mime (1.0.1)
-    mini_portile2 (2.3.0)
+    mini_portile2 (2.4.0)
     minitest (5.11.3)
     mobile-fu (1.4.0)
       rack-mobile-detect
@@ -404,8 +404,8 @@ GEM
     naught (1.1.0)
     nenv (0.3.0)
     nio4r (2.3.1)
-    nokogiri (1.8.5)
-      mini_portile2 (~> 2.3.0)
+    nokogiri (1.10.1)
+      mini_portile2 (~> 2.4.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
@@ -418,15 +418,15 @@ GEM
       rack (>= 1.2, < 3)
     octokit (4.13.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    omniauth (1.8.1)
-      hashie (>= 3.4.6, < 3.6.0)
+    omniauth (1.9.0)
+      hashie (>= 3.4.6, < 3.7.0)
       rack (>= 1.6.2, < 3)
     omniauth-oauth (1.1.0)
       oauth
       omniauth (~> 1.0)
-    omniauth-oauth2 (1.5.0)
+    omniauth-oauth2 (1.6.0)
       oauth2 (~> 1.1)
-      omniauth (~> 1.2)
+      omniauth (~> 1.9)
     omniauth-tumblr (1.2)
       multi_json
       omniauth-oauth (~> 1.0)
@@ -449,16 +449,15 @@ GEM
       validate_url
       webfinger (>= 1.0.1)
     orm_adapter (0.5.0)
-    parallel (1.12.1)
-    parser (2.5.3.0)
+    parallel (1.14.0)
+    parser (2.6.2.0)
       ast (~> 2.4.0)
-    pg (1.1.3)
+    pg (1.1.4)
     phantomjs (2.1.1.0)
     poltergeist (1.18.1)
       capybara (>= 2.1, < 4)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
-    powerpack (0.1.2)
     pronto (0.9.5)
       gitlab (~> 4.0, >= 4.0.0)
       httparty (>= 0.13.7)
@@ -481,9 +480,10 @@ GEM
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    pry-byebug (3.6.0)
-      byebug (~> 10.0)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
       pry (~> 0.10)
+    psych (3.1.0)
     public_suffix (3.0.3)
     raabro (1.1.6)
     rack (2.0.6)
@@ -500,24 +500,24 @@ GEM
       json-jwt (>= 1.9.0)
       rack
     rack-piwik (0.3.0)
-    rack-protection (2.0.4)
+    rack-protection (2.0.5)
       rack
     rack-rewrite (1.5.1)
     rack-ssl (1.4.1)
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.1.6)
-      actioncable (= 5.1.6)
-      actionmailer (= 5.1.6)
-      actionpack (= 5.1.6)
-      actionview (= 5.1.6)
-      activejob (= 5.1.6)
-      activemodel (= 5.1.6)
-      activerecord (= 5.1.6)
-      activesupport (= 5.1.6)
+    rails (5.1.6.2)
+      actioncable (= 5.1.6.2)
+      actionmailer (= 5.1.6.2)
+      actionpack (= 5.1.6.2)
+      actionview (= 5.1.6.2)
+      activejob (= 5.1.6.2)
+      activemodel (= 5.1.6.2)
+      activerecord (= 5.1.6.2)
+      activesupport (= 5.1.6.2)
       bundler (>= 1.3.0)
-      railties (= 5.1.6)
+      railties (= 5.1.6.2)
       sprockets-rails (>= 2.0.0)
     rails-assets-autosize (4.0.2)
     rails-assets-backbone (1.3.3)
@@ -567,42 +567,42 @@ GEM
     rails-assets-pica (5.0.0)
     rails-assets-underscore (1.9.1)
     rails-assets-utatti-perfect-scrollbar (1.4.0)
-    rails-controller-testing (1.0.2)
-      actionpack (~> 5.x, >= 5.0.1)
-      actionview (~> 5.x, >= 5.0.1)
-      activesupport (~> 5.x)
+    rails-controller-testing (1.0.4)
+      actionpack (>= 5.0.1.x)
+      actionview (>= 5.0.1.x)
+      activesupport (>= 5.0.1.x)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.4)
       loofah (~> 2.2, >= 2.2.2)
-    rails-i18n (5.1.2)
+    rails-i18n (5.1.3)
       i18n (>= 0.7, < 2)
       railties (>= 5.0, < 6)
-    rails-timeago (2.16.0)
+    rails-timeago (2.17.1)
       actionpack (>= 3.1)
       activesupport (>= 3.1)
-    railties (5.1.6)
-      actionpack (= 5.1.6)
-      activesupport (= 5.1.6)
+    railties (5.1.6.2)
+      actionpack (= 5.1.6.2)
+      activesupport (= 5.1.6.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.2.2)
       rake
     raindrops (0.19.0)
-    rake (12.3.1)
+    rake (12.3.2)
     rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
     redcarpet (3.4.0)
     redis (3.3.5)
     regexp_parser (1.3.0)
     request_store (1.4.1)
       rack (>= 1.4)
-    responders (2.4.0)
-      actionpack (>= 4.2.0, < 5.3)
-      railties (>= 4.2.0, < 5.3)
+    responders (2.4.1)
+      actionpack (>= 4.2.0, < 6.0)
+      railties (>= 4.2.0, < 6.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -616,7 +616,7 @@ GEM
     rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-rails (3.8.1)
+    rspec-rails (3.8.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
@@ -625,20 +625,20 @@ GEM
       rspec-mocks (~> 3.8.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    rubocop (0.60.0)
+    rubocop (0.66.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
-      powerpack (~> 0.1)
+      psych (>= 3.1.0)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.4.0)
+      unicode-display_width (>= 1.4.0, < 1.6)
     ruby-oembed (0.12.0)
     ruby-progressbar (1.10.0)
     ruby_dep (1.5.0)
     rubyzip (1.2.2)
-    rugged (0.27.5)
-    safe_yaml (1.0.4)
+    rugged (0.28.1)
+    safe_yaml (1.0.5)
     sass (3.4.25)
     sass-rails (5.0.7)
       railties (>= 4.0.0, < 6)
@@ -646,21 +646,25 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
+    sassc (2.0.1)
+      ffi (~> 1.9)
+      rake
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
     scss_lint (0.55.0)
       rake (>= 0.9, < 13)
       sass (~> 3.4.20)
-    secure_headers (6.0.0)
+    secure_headers (6.1.0)
     shellany (0.0.1)
-    shoulda-matchers (3.1.2)
-      activesupport (>= 4.0.0)
-    sidekiq (5.2.3)
+    shoulda-matchers (4.0.1)
+      activesupport (>= 4.2.0)
+    sidekiq (5.2.5)
       connection_pool (~> 2.2, >= 2.2.2)
+      rack (>= 1.5.0)
       rack-protection (>= 1.5.0)
       redis (>= 3.3.5, < 5)
-    sidekiq-cron (1.0.4)
+    sidekiq-cron (1.1.0)
       fugit (~> 1.1)
       sidekiq (>= 4.2.1)
     simple_captcha2 (0.4.3)
@@ -698,16 +702,16 @@ GEM
       httpclient (>= 2.4)
     sysexits (1.2.0)
     systemu (2.6.5)
-    temple (0.8.0)
-    term-ansicolor (1.7.0)
+    temple (0.8.1)
+    term-ansicolor (1.7.1)
       tins (~> 1.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thor (0.19.4)
     thread_safe (0.3.6)
-    tilt (2.0.8)
+    tilt (2.0.9)
     timecop (0.9.1)
-    timers (4.2.0)
+    timers (4.3.0)
     tins (1.20.2)
     to_regexp (0.2.1)
     turbo_dev_assets (0.0.2)
@@ -729,13 +733,13 @@ GEM
       ethon (>= 0.9.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    uglifier (4.1.19)
+    uglifier (4.1.20)
       execjs (>= 0.3.0, < 3)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)
-    unicode-display_width (1.4.0)
-    unicorn (5.4.1)
+    unicode-display_width (1.5.0)
+    unicorn (5.5.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
     unicorn-worker-killer (0.4.4)
@@ -747,9 +751,9 @@ GEM
     validate_email (0.1.6)
       activemodel (>= 3.0)
       mail (>= 2.2.5)
-    validate_url (1.0.2)
+    validate_url (1.0.6)
       activemodel (>= 3.0.0)
-      addressable
+      public_suffix
     versionist (1.7.0)
       activesupport (>= 3)
       railties (>= 3)
@@ -759,40 +763,40 @@ GEM
     webfinger (1.1.0)
       activesupport
       httpclient (>= 2.4)
-    webmock (3.4.2)
+    webmock (3.5.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
-    will_paginate (3.1.6)
+    will_paginate (3.1.7)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    yard (0.9.16)
+    yard (0.9.18)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   active_model_serializers (= 0.9.7)
-  activerecord-import (= 0.27.0)
+  activerecord-import (= 1.0.1)
   acts-as-taggable-on (= 6.0.0)
   acts_as_api (= 1.0.1)
   addressable (= 2.5.2)
-  asset_sync (= 2.5.0)
+  asset_sync (= 2.7.0)
   autoprefixer-rails (= 8.6.5)
-  bootstrap-sass (= 3.3.7)
+  bootstrap-sass (= 3.4.1)
   bootstrap-switch-rails (= 3.3.3)
-  capybara (= 3.11.1)
-  carrierwave (= 1.2.3)
+  capybara (= 3.15.0)
+  carrierwave (= 1.3.1)
   compass-rails (= 3.1.0)
   configurate (= 0.3.1)
   coveralls (= 0.8.22)
   cucumber-api-steps (= 0.14)
   cucumber-rails (= 1.6.0)
   database_cleaner (= 1.7.0)
-  devise (= 4.5.0)
+  devise (= 4.6.1)
   devise_lastseenable (= 0.0.6)
   diaspora-prosody-config (= 0.0.7)
   diaspora_federation-json_schema (= 0.2.5)
@@ -801,19 +805,19 @@ DEPENDENCIES
   entypo-rails (= 3.0.0)
   eye (= 0.10.0)
   factory_girl_rails (= 4.8.0)
-  faraday (= 0.15.3)
+  faraday (= 0.15.4)
   faraday-cookie_jar (= 0.0.6)
   faraday_middleware (= 0.12.2)
   fixture_builder (= 0.5.2.rc3)
-  fog-aws (= 3.3.0)
+  fog-aws (= 3.4.0)
   fuubar (= 2.3.2)
   gon (= 6.2.1)
   guard (= 2.15.0)
   guard-rspec (= 4.7.3)
   guard-rubocop (= 1.3.0)
   haml_lint (= 0.28.0)
-  hamlit (= 2.9.1)
-  handlebars_assets (= 0.23.2)
+  hamlit (= 2.9.2)
+  handlebars_assets (= 0.23.3)
   http_accept_language (= 2.1.1)
   i18n-inflector-rails (= 1.0.7)
   jasmine (= 3.3.0)
@@ -821,25 +825,25 @@ DEPENDENCIES
   jquery-rails (= 4.3.3)
   js-routes (= 1.4.4)
   js_image_paths (= 0.1.1)
-  json (= 2.1.0)
+  json (= 2.2.0)
   json-schema (= 2.8.1)
   json-schema-rspec (= 0.0.4)
   leaflet-rails (= 1.3.1)
   logging-rails (= 0.6.0)
   markdown-it-html5-embed (= 1.0.0)
   markerb (= 1.1.0)
-  mini_magick (= 4.9.2)
+  mini_magick (= 4.9.3)
   minitest
   mobile-fu (= 1.4.0)
   mysql2 (= 0.5.2)
-  nokogiri (= 1.8.5)
-  omniauth (= 1.8.1)
+  nokogiri (= 1.10.1)
+  omniauth (= 1.9.0)
   omniauth-tumblr (= 1.2)
   omniauth-twitter (= 1.4.0)
   omniauth-wordpress (= 0.2.2)
   open_graph_reader (= 0.6.2)
   openid_connect (= 1.1.6)
-  pg (= 1.1.3)
+  pg (= 1.1.4)
   poltergeist (= 1.18.1)
   pronto (= 0.9.5)
   pronto-eslint (= 0.9.1)
@@ -853,7 +857,7 @@ DEPENDENCIES
   rack-piwik (= 0.3.0)
   rack-rewrite (= 1.5.1)
   rack-ssl (= 1.4.1)
-  rails (= 5.1.6)
+  rails (= 5.1.6.2)
   rails-assets-autosize (= 4.0.2)!
   rails-assets-backbone (= 1.3.3)!
   rails-assets-blueimp-gallery (= 2.33.0)!
@@ -878,24 +882,24 @@ DEPENDENCIES
   rails-assets-markdown-it-sup (= 1.0.0)!
   rails-assets-pica (= 5.0.0)!
   rails-assets-utatti-perfect-scrollbar (= 1.4.0)!
-  rails-controller-testing (= 1.0.2)
-  rails-i18n (= 5.1.2)
-  rails-timeago (= 2.16.0)
+  rails-controller-testing (= 1.0.4)
+  rails-i18n (= 5.1.3)
+  rails-timeago (= 2.17.1)
   rb-fsevent (= 0.10.3)
-  rb-inotify (= 0.9.10)
+  rb-inotify (= 0.10.0)
   redcarpet (= 3.4.0)
   redis (= 3.3.5)
-  responders (= 2.4.0)
+  responders (= 2.4.1)
   rspec-json_expectations (~> 2.1)
-  rspec-rails (= 3.8.1)
-  rubocop (= 0.60.0)
+  rspec-rails (= 3.8.2)
+  rubocop (= 0.66.0)
   ruby-oembed (= 0.12.0)
   rubyzip (= 1.2.2)
   sass-rails (= 5.0.7)
-  secure_headers (= 6.0.0)
-  shoulda-matchers (= 3.1.2)
-  sidekiq (= 5.2.3)
-  sidekiq-cron (= 1.0.4)
+  secure_headers (= 6.1.0)
+  shoulda-matchers (= 4.0.1)
+  sidekiq (= 5.2.5)
+  sidekiq-cron (= 1.1.0)
   simple_captcha2 (= 0.4.3)
   simplecov (= 0.16.1)
   sinon-rails (= 1.15.0)
@@ -910,13 +914,13 @@ DEPENDENCIES
   twitter (= 6.2.0)
   twitter-text (= 3.0.0)
   typhoeus (= 1.3.1)
-  uglifier (= 4.1.19)
-  unicorn (= 5.4.1)
+  uglifier (= 4.1.20)
+  unicorn (= 5.5.0)
   unicorn-worker-killer (= 0.4.4)
   uuid (= 2.3.9)
   versionist (= 1.7.0)
-  webmock (= 3.4.2)
-  will_paginate (= 3.1.6)
+  webmock (= 3.5.1)
+  will_paginate (= 3.1.7)
 
 BUNDLED WITH
-   1.17.1
+   1.17.3
diff --git a/app/views/devise/confirmations/new.html.haml b/app/views/devise/confirmations/new.html.haml
index 04965f756..b1a4555d8 100644
--- a/app/views/devise/confirmations/new.html.haml
+++ b/app/views/devise/confirmations/new.html.haml
@@ -1,10 +1,10 @@
 %h2 Resend confirmation instructions
 = form_for(resource, :as => resource_name, :url => confirmation_path(resource_name)) do |f|
-  = devise_error_messages!
+  = render partial: "devise/shared/error_messages"
   %p
     = f.label :email
     %br/
     = f.text_field :email
   %p
   = f.submit t('.resend_confirmation')
-= render :partial => "devise/shared/links"
+= render partial: "devise/shared/links"
diff --git a/app/views/devise/passwords/edit.mobile.haml b/app/views/devise/passwords/edit.mobile.haml
index a9d7df344..b3d758b12 100644
--- a/app/views/devise/passwords/edit.mobile.haml
+++ b/app/views/devise/passwords/edit.mobile.haml
@@ -6,7 +6,7 @@
   .login-form
     .login-container
       = form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|
-        = devise_error_messages!
+        = render partial: "devise/shared/error_messages", formats: [:html]
         = f.hidden_field :reset_password_token
         %fieldset
           %legend
diff --git a/app/views/devise/passwords/new.haml b/app/views/devise/passwords/new.haml
index 627aa3a1d..9a5683b63 100644
--- a/app/views/devise/passwords/new.haml
+++ b/app/views/devise/passwords/new.haml
@@ -9,7 +9,7 @@
         = AppConfig.settings.pod_name
 
     = form_for(resource, as: resource_name, url: password_path(resource_name), html: {class: "form-horizontal block-form"}, autocomplete: 'off') do |f|
-      - if !devise_error_messages!.empty?
+      - unless resource.errors.empty?
         %legend
           %i
             = t('devise.passwords.new.no_account') # this is an error message and should not be displayed as a legend
diff --git a/app/views/devise/passwords/new.mobile.haml b/app/views/devise/passwords/new.mobile.haml
index af496b0bf..63bcedfd8 100644
--- a/app/views/devise/passwords/new.mobile.haml
+++ b/app/views/devise/passwords/new.mobile.haml
@@ -9,7 +9,7 @@
         %fieldset
           %legend
             =t('devise.passwords.new.forgot_password')
-          - unless devise_error_messages!.empty?
+          - unless resource.errors.empty?
             %i=  t('devise.passwords.new.no_account')
 
           .control-group
diff --git a/app/views/devise/unlocks/new.html.haml b/app/views/devise/unlocks/new.html.haml
index 6fff589eb..d3f1d629d 100644
--- a/app/views/devise/unlocks/new.html.haml
+++ b/app/views/devise/unlocks/new.html.haml
@@ -1,10 +1,10 @@
 %h2 Resend unlock instructions
 = form_for(resource, :as => resource_name, :url => unlock_path(resource_name)) do |f|
-  = devise_error_messages!
+  = render partial: "devise/shared/error_messages"
   %p
     = f.label :email
     %br/
     = f.text_field :email
   %p
   = f.submit t('.resend_unlock')
-= render :partial => "devise/shared/links"
+= render partial: "devise/shared/links"