Update OS to 4.9

composer.json

@@ -9,7 +9,7 @@
         "composer/installers": "^v1.4.0",
         "drupal-composer/drupal-scaffold": "^2.0.0",
         "cweagans/composer-patches": "^1.0",
-        "goalgorilla/open_social": "4.5",
+        "goalgorilla/open_social": "4.9",
         "drupal/coffee": "1.x-dev",
         "drupal/sparkpost": "2.0-rc1",
         "drupal/reroute_email": "^1.0",
@@ -19,7 +19,6 @@
         "drupal/config_ignore": "^2.1",
         "drupal/slack": "^1.2",
         "drush/drush": "^9@rc",
-        "drupal/social": "4.5",
         "drupal/recaptcha": "^2.3"
     },
     "require-dev": {
@@ -113,9 +112,6 @@
         "patches": {
             "drupal/core": {
                 "Keep setting.php intact, add local config to settings.local.php": "https://github.com/zaporylie/drupal/commit/6f0b4e95f28ae945c6fa2bf0e5e81850d3e695f8.patch"
-            },
-            "drupal/bootstrap": {
-                "Error: Unsupported operand types during providers JSON discovery": "https://www.drupal.org/files/issues/2019-01-24/3027569-8.x-3.x-8.patch"
             }
         },
         "enable-patching": true,

config/editor.editor.basic_html.yml

@@ -7,7 +7,7 @@ dependencies:
   module:
     - ckeditor
 _core:
-  default_config_hash: AqlPmO16LvJI4D0Ih6u4GFQIzqr5OnLgAUSjcUGWk2g
+  default_config_hash: aDq5he_U0ZM3K5uqY7LqlRQtPIgqwgVh9vmQeNSu7Ck
 format: basic_html
 editor: ckeditor
 settings:
@@ -42,6 +42,7 @@ settings:
           name: Tools
           items:
             - Source
+            - Maximize
   plugins:
     stylescombo:
       styles: ''

config/editor.editor.full_html.yml

@@ -7,7 +7,7 @@ dependencies:
   module:
     - ckeditor
 _core:
-  default_config_hash: uSZwSmVKjzKDyHXl-T3AvMVrjHi_0axD7lsz7eqre2I
+  default_config_hash: YvMwqCuM0QsEzQEGaa64MAB9Me3w6oUCfBuOAni-xmk
 format: full_html
 editor: ckeditor
 settings:
@@ -58,6 +58,7 @@ settings:
           items:
             - ShowBlocks
             - Source
+            - Maximize
   plugins:
     language:
       language_list: un

config/language/nb/message.template.create_comment_community_node.yml

@@ -1,7 +1,7 @@
 text:
   -
-    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> commented on [social_comment:parent_entity_author]'s [social_comment:commented_content_type]</p>\r\n"
+    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> commented on [social_comment:parent_entity_author]'s [social_comment:commented_content_type]</p>\n"
     format: full_html
   -
-    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> and @count others commented on [social_comment:parent_entity_author]'s [social_comment:commented_content_type]</p>\r\n"
+    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> and @count others commented on [social_comment:parent_entity_author]'s [social_comment:commented_content_type]</p>\n"
     format: full_html

config/language/nb/message.template.create_comment_following_node.yml

@@ -1,10 +1,10 @@
 text:
   -
-    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> commented on [social_comment:parent_entity_author]'s [social_comment:commented_content_type] <a href=\"[message:field_message_related_object:entity:url:absolute]\">[message:node-title]</a> you are following</p>\r\n"
+    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> commented on [social_comment:parent_entity_author]'s [social_comment:commented_content_type] <a href=\"[message:field_message_related_object:entity:url:absolute]\">[message:node-title]</a> you are following</p>\n"
     format: full_html
   -
-    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> commented on [social_comment:parent_entity_author]'s [social_comment:commented_content_type] <a href=\"[message:field_message_related_object:entity:url:absolute]\">[message:node-title]</a> you are following</p>\r\n"
+    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> commented on [social_comment:parent_entity_author]'s [social_comment:commented_content_type] <a href=\"[message:field_message_related_object:entity:url:absolute]\">[message:node-title]</a> you are following</p>\n"
     format: full_html
   -
-    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> commented on [social_comment:parent_entity_author]'s [social_comment:commented_content_type] <a href=\"[message:field_message_related_object:entity:url:absolute]\">[message:node-title]</a> you are following</p>\r\n"
+    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> commented on [social_comment:parent_entity_author]'s [social_comment:commented_content_type] <a href=\"[message:field_message_related_object:entity:url:absolute]\">[message:node-title]</a> you are following</p>\n"
     format: full_html

config/language/nb/message.template.create_comment_group_node.yml

@@ -1,6 +1,6 @@
 text:
   -
-    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> commented on [social_comment:parent_entity_author]'s [social_comment:commented_content_type] in <a href=\"[message:gurl]\">[message:gtitle]</a></p>\r\n"
+    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> commented on [social_comment:parent_entity_author]'s [social_comment:commented_content_type] in <a href=\"[message:gurl]\">[message:gtitle]</a></p>\n"
     format: full_html
   -
     value: '<p><a href="[message:author:url:absolute]">[message:author:display-name]</a> and @count others commented on [social_comment:parent_entity_author]''s [social_comment:commented_content_type] in <a href="[message:gurl]">[message:gtitle]</a></p>'

config/language/nb/message.template.create_comment_post_profile.yml

@@ -1,10 +1,10 @@
 text:
   -
     format: full_html
-    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> commented on a post on your <a href=\"[message:recipient-user-url]\">profile</a></p>\r\n"
+    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> commented on a post on your <a href=\"[message:recipient-user-url]\">profile</a></p>\n"
   -
     format: full_html
-    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> commented on a post on your <a href=\"[message:recipient-user-url]\">profile</a></p>\r\n"
+    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> commented on a post on your <a href=\"[message:recipient-user-url]\">profile</a></p>\n"
   -
     format: full_html
     value: '<p><a href="[message:author:url:absolute]">[message:author:display-name]</a> commented on a post on your <a href="[message:recipient-user-url]">profile</a></p>'

config/language/nb/message.template.create_comment_reply.yml

@@ -1,10 +1,10 @@
 text:
   -
     format: full_html
-    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> replied on your <a href=\"[message:field_message_related_object:entity:url:absolute]\">comment</a> in [social_comment:commented_entity_link_html]</p>\r\n"
+    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> replied on your <a href=\"[message:field_message_related_object:entity:url:absolute]\">comment</a> in [social_comment:commented_entity_link_html]</p>\n"
   -
     format: full_html
-    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> replied on your <a href=\"[message:field_message_related_object:entity:url:absolute]\">comment</a> in [social_comment:commented_entity_link_html]</p>\r\n"
+    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> replied on your <a href=\"[message:field_message_related_object:entity:url:absolute]\">comment</a> in [social_comment:commented_entity_link_html]</p>\n"
   -
     format: full_html
     value: '<p><a href="[message:author:url:absolute]">[message:author:display-name]</a> replied on your <a href="[message:field_message_related_object:entity:url:absolute]">comment</a> in [social_comment:commented_entity_link_html]</p>'

config/language/nb/message.template.create_mention_comment_stream.yml

@@ -1,4 +1,4 @@
 text:
   -
-    value: "<p><a href=\"\">[message:author:display-name]</a> mentioned<a href=\"\"> [social_mentions:mentioned_user] </a>in a comment</p>\r\n"
+    value: "<p><a href=\"\">[message:author:display-name]</a> mentioned<a href=\"\"> [social_mentions:mentioned_user] </a>in a comment</p>\n"
     format: basic_html

config/language/nb/message.template.create_mention_post_stream.yml

@@ -1,4 +1,4 @@
 text:
   -
-    value: "<p><a href=\"\">[message:author:display-name]</a> mentioned <a href=\"\">[social_mentions:mentioned_user]</a> in a post</p>\r\n"
+    value: "<p><a href=\"\">[message:author:display-name]</a> mentioned <a href=\"\">[social_mentions:mentioned_user]</a> in a post</p>\n"
     format: basic_html

config/language/nb/message.template.create_post_profile.yml

@@ -1,10 +1,10 @@
 text:
   -
     format: full_html
-    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> posted on your profile</p>\r\n"
+    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> posted on your profile</p>\n"
   -
     format: full_html
-    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> posted on your profile</p>\r\n"
+    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> posted on your profile</p>\n"
   -
     format: full_html
     value: '<p><a href="[message:author:url:absolute]">[message:author:display-name]</a> posted on your <a href="[message:recipient-user-url]">profile</a></p>'

config/language/nb/message.template.create_post_profile_stream.yml

@@ -1,10 +1,10 @@
 text:
   -
     format: full_html
-    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> &gt; <a href=\"[message:recipient-user-url]\">[activity:field_activity_recipient_user_display_name]</a></p>\r\n"
+    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> &gt; <a href=\"[message:recipient-user-url]\">[activity:field_activity_recipient_user_display_name]</a></p>\n"
   -
     format: full_html
-    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> posted on your profile</p>\r\n"
+    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> posted on your profile</p>\n"
   -
     format: full_html
     value: '<p><a href="[message:author:url:absolute]">[message:author:display-name]</a> posted on your <a href="[message:recipient-user-url]">profile</a></p>'

config/message.template.activity_on_events_im_organizing.yml

@@ -13,8 +13,8 @@ third_party_settings:
     activity_destinations:
       notifications: notifications
       email: email
-    activity_create_direct: 1
-    activity_aggregate: 0
+    activity_create_direct: true
+    activity_aggregate: false
     activity_entity_condition: ''
 _core:
   default_config_hash: VNiBieLz0xyHzFpI9PbX_3iKPlXRWmRu1xT2DHxzBDA

config/message.template.create_comment_community_node.yml

@@ -17,16 +17,16 @@ third_party_settings:
     activity_aggregate: 1
     activity_entity_condition: comment_not_reply
 _core:
-  default_config_hash: XM7CsEOxi7pbETb3fVVffg_Bw28EXbZJfDdP1xN6tDI
+  default_config_hash: dL6ebaOTtEEseLIn2aJePZCssDoJ2TF2ws6LhkNEMTc
 template: create_comment_community_node
 label: 'Create comment on node in the community'
 description: 'A user add a comment to content in the community'
 text:
   -
-    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> commented on [social_comment:parent_entity_author]'s [social_comment:commented_content_type]</p>\r\n"
+    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> commented on [social_comment:parent_entity_author]'s [social_comment:commented_content_type]</p>\n"
     format: full_html
   -
-    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> and @count others commented on [social_comment:parent_entity_author]'s [social_comment:commented_content_type]</p>\r\n"
+    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> and @count others commented on [social_comment:parent_entity_author]'s [social_comment:commented_content_type]</p>\n"
     format: full_html
 settings:
   'token options':

config/message.template.create_comment_following_node.yml

@@ -17,19 +17,19 @@ third_party_settings:
     activity_aggregate: 0
     activity_entity_condition: comment_all
 _core:
-  default_config_hash: RmGJ19tFfx2QfUARRqrJ-QtdAF9K4n0eQ9NjqB9sllQ
+  default_config_hash: x1ejDKaQA1PTd7A-8T9KbPMxOKECeT7NhXREdtAU39s
 template: create_comment_following_node
 label: 'Create comment on following node'
 description: 'A person commented on content I am following'
 text:
   -
-    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> commented on [social_comment:parent_entity_author]'s [social_comment:commented_content_type] <a href=\"[message:field_message_related_object:entity:url:absolute]\">[message:node-title]</a> you are following</p>\r\n"
+    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> commented on [social_comment:parent_entity_author]'s [social_comment:commented_content_type] <a href=\"[message:field_message_related_object:entity:url:absolute]\">[message:node-title]</a> you are following</p>\n"
     format: full_html
   -
-    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> commented on [social_comment:parent_entity_author]'s [social_comment:commented_content_type] <a href=\"[message:field_message_related_object:entity:url:absolute]\">[message:node-title]</a> you are following</p>\r\n"
+    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> commented on [social_comment:parent_entity_author]'s [social_comment:commented_content_type] <a href=\"[message:field_message_related_object:entity:url:absolute]\">[message:node-title]</a> you are following</p>\n"
     format: full_html
   -
-    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> commented on [social_comment:parent_entity_author]'s [social_comment:commented_content_type] <a href=\"[message:field_message_related_object:entity:url:absolute]\">[message:node-title]</a> you are following</p>\r\n"
+    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> commented on [social_comment:parent_entity_author]'s [social_comment:commented_content_type] <a href=\"[message:field_message_related_object:entity:url:absolute]\">[message:node-title]</a> you are following</p>\n"
     format: full_html
 settings:
   'token options':

config/message.template.create_comment_group_node.yml

@@ -19,13 +19,13 @@ third_party_settings:
     activity_aggregate: 1
     activity_entity_condition: comment_not_reply
 _core:
-  default_config_hash: qpSbf7XxVC08z3ehgN_GDJNvLCx56DPFcuy2ZVwEk1U
+  default_config_hash: Xpiwy9_US7kX5AIDS0E5D9Xt5t4o_RPJtBSBZr9NcQY
 template: create_comment_group_node
 label: 'Create comment on node in the group'
 description: 'A user add a comment to content in the group'
 text:
   -
-    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> commented on [social_comment:parent_entity_author]'s [social_comment:commented_content_type] in <a href=\"[message:gurl]\">[message:gtitle]</a></p>\r\n"
+    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> commented on [social_comment:parent_entity_author]'s [social_comment:commented_content_type] in <a href=\"[message:gurl]\">[message:gtitle]</a></p>\n"
     format: full_html
   -
     value: '<p><a href="[message:author:url:absolute]">[message:author:display-name]</a> and @count others commented on [social_comment:parent_entity_author]''s [social_comment:commented_content_type] in <a href="[message:gurl]">[message:gtitle]</a></p>'

config/message.template.create_comment_post_profile.yml

@@ -17,17 +17,17 @@ third_party_settings:
     activity_aggregate: 0
     activity_entity_condition: comment_not_reply
 _core:
-  default_config_hash: VzdQ8vTRrqzyGuXw2z7VP7vzX7bhEZLQhdrcVjo5dhk
+  default_config_hash: ePCVJJD06SqeDNYbeBxvwvG4qLC56w2w7NxR29TYW4k
 template: create_comment_post_profile
 label: 'Create comment on post on my profile'
 description: 'A person commented on a post on my profile'
 text:
   -
     format: full_html
-    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> commented on a post on your <a href=\"[message:recipient-user-url]\">profile</a></p>\r\n"
+    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> commented on a post on your <a href=\"[message:recipient-user-url]\">profile</a></p>\n"
   -
     format: full_html
-    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> commented on a post on your <a href=\"[message:recipient-user-url]\">profile</a></p>\r\n"
+    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> commented on a post on your <a href=\"[message:recipient-user-url]\">profile</a></p>\n"
   -
     format: full_html
     value: '<p><a href="[message:author:url:absolute]">[message:author:display-name]</a> commented on a post on your <a href="[message:recipient-user-url]">profile</a></p>'

config/message.template.create_comment_reply.yml

@@ -17,17 +17,17 @@ third_party_settings:
     activity_aggregate: 0
     activity_entity_condition: comment_reply
 _core:
-  default_config_hash: PCWQf-8FiAZaPBWrO-QQxwM5UJrfKptxBDNem0-Bbh0
+  default_config_hash: FXh4diyofDUTHnGZmI2ta6S_FSOQRFI7GwZpoRTF6hA
 template: create_comment_reply
 label: 'Create reply on my comment'
 description: 'A person replied on my comments'
 text:
   -
     format: full_html
-    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> replied on your <a href=\"[message:field_message_related_object:entity:url:absolute]\">comment</a> in [social_comment:commented_entity_link_html]</p>\r\n"
+    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> replied on your <a href=\"[message:field_message_related_object:entity:url:absolute]\">comment</a> in [social_comment:commented_entity_link_html]</p>\n"
   -
     format: full_html
-    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> replied on your <a href=\"[message:field_message_related_object:entity:url:absolute]\">comment</a> in [social_comment:commented_entity_link_html]</p>\r\n"
+    value: "<p><a href=\"[message:author:url:absolute]\">[message:author:display-name]</a> replied on your <a href=\"[message:field_message_related_object:entity:url:absolute]\">comment</a> in [social_comment:commented_entity_link_html]</p>\n"
   -
     format: full_html
     value: '<p><a href="[message:author:url:absolute]">[message:author:display-name]</a> replied on your <a href="[message:field_message_related_object:entity:url:absolute]">comment</a> in [social_comment:commented_entity_link_html]</p>'

config/message.template.create_mention_comment_stream.yml

@@ -16,13 +16,13 @@ third_party_settings:
     activity_aggregate: 0
     activity_entity_condition: mention_comment
 _core:
-  default_config_hash: AUjeqt88sCNRk0SSWkvPpGBasj1x4_DtP-210nbJEus
+  default_config_hash: 9hCeIXvZlJrHgwBEsHzlSrMEtrVty8m0xSywwuAOAHI
 template: create_mention_comment_stream
 label: 'Create mention in a comment (stream: profile)'
 description: 'A person mentioned me in a comment (stream: profile)'
 text:
   -
-    value: "<p><a href=\"\">[message:author:display-name]</a> mentioned<a href=\"\"> [social_mentions:mentioned_user] </a>in a comment</p>\r\n"
+    value: "<p><a href=\"\">[message:author:display-name]</a> mentioned<a href=\"\"> [social_mentions:mentioned_user] </a>in a comment</p>\n"
     format: basic_html
 settings:
   'token options':

config/message.template.create_mention_post_stream.yml

@@ -16,13 +16,13 @@ third_party_settings:
     activity_aggregate: 0
     activity_entity_condition: mention_post
 _core:
-  default_config_hash: iSRgdrUGGEfHKBqekWU4rg0oa-IFhdlawNsVcOEY_Nw
+  default_config_hash: AiSquT8Sp70tAx-ra3IYzdzT2pRJVWpSt5bRtEZ0qhg
 template: create_mention_post_stream
 label: 'Create mention in a post (stream: profile)'
 description: 'A person mentioned me in a post (stream: profile)'
 text:
   -
-    value: "<p><a href=\"\">[message:author:display-name]</a> mentioned <a href=\"\">[social_mentions:mentioned_user]</a> in a post</p>\r\n"
+    value: "<p><a href=\"\">[message:author:display-name]</a> mentioned <a href=\"\">[social_mentions:mentioned_user]</a> in a post</p>\n"
     format: basic_html
 settings:
   'token options':