Merge branch 'stable' into develop

[ci skip]

Changelog.md

@@ -53,6 +53,7 @@ Ruby 2.0 is no longer officially supported.
 * Replace vendored assets for facebox by gem [#6005](https://github.com/diaspora/diaspora/pull/6005)
 * Improve styling of horizontal ruler in posts [#6016](https://github.com/diaspora/diaspora/pull/6016)
 * Increase post titles length to 50 and use configured pod name as title in the atom feed [#6020](https://github.com/diaspora/diaspora/pull/6020)
+* Remove deprecated Facebook permissions [#6019](https://github.com/diaspora/diaspora/pull/6019)
 
 ## Bug fixes
 * Disable auto follow back on aspect deletion [#5846](https://github.com/diaspora/diaspora/pull/5846)

config/initializers/omniauth.rb

@@ -17,8 +17,8 @@ Rails.application.config.middleware.use OmniAuth::Builder do
   
   if AppConfig.services.facebook.enable?
     provider :facebook, AppConfig.services.facebook.app_id, AppConfig.services.facebook.secret, {
-      display: 'popup',
-      scope: 'publish_actions,publish_stream,offline_access',
+      display:        "popup",
+      scope:          "public_profile,publish_actions",
       client_options: {
         ssl: {
           ca_file: AppConfig.environment.certificate_authorities