Merge branch 'develop' into dependabot/npm_and_yarn/html/themes/custo…

…m/gms_ocha_common/stylelint-15.10.1

composer.json

@@ -1,6 +1,6 @@
 {
-    "name": "unocha/starterkit",
-    "description": "Starterkit",
+    "name": "unocha/gms-site",
+    "description": "GMS Site",
     "type": "project",
     "license": "GPL-2.0-or-later",
     "authors": [
@@ -145,10 +145,6 @@
         "drupal/menu_firstchild": "^2.0",
         "drupal/menu_link_attributes": "^1.2",
         "drupal/metatag": "^1.16",
-        "drupal/migrate_file": "^2.0",
-        "drupal/migrate_plus": "^5.1",
-        "drupal/migrate_tools": "^5.0",
-        "drupal/migrate_upgrade": "^3.2",
         "drupal/modules_weight": "^1.9",
         "drupal/noreqnewpass": "^1.2",
         "drupal/onomasticon": "^2.0",
@@ -206,7 +202,6 @@
             "composer/installers": true,
             "cweagans/composer-patches": true,
             "dealerdirect/phpcodesniffer-composer-installer": true,
-            "drupal-composer/preserve-paths": true,
             "drupal/core-composer-scaffold": true,
             "drupal/core-project-message": true,
             "drupal/console-extend-plugin": true,

config/block.block.searchbutton.yml

@@ -1,12 +1,9 @@
 uuid: d3a913cd-7406-458b-899d-d08515a0a03d
 langcode: en
-status: true
+status: false
 dependencies:
-  content:
-    - 'block_content:basic:9f5582ff-f68a-4288-a687-884c73cb8106'
   module:
     - block_class
-    - block_content
   theme:
     - gms_ocha_common
 third_party_settings:

config/block.block.searchbutton_2.yml

@@ -0,0 +1,25 @@
+uuid: 73377b2c-23b7-41a0-9de6-8b93c2fafeef
+langcode: en
+status: true
+dependencies:
+  content:
+    - 'block_content:basic:4a68b22f-61ee-473a-ab50-3d8e8ca93c08'
+  module:
+    - block_content
+  theme:
+    - gms_ocha_common
+id: searchbutton_2
+theme: gms_ocha_common
+region: header_search
+weight: 0
+provider: null
+plugin: 'block_content:4a68b22f-61ee-473a-ab50-3d8e8ca93c08'
+settings:
+  id: 'block_content:4a68b22f-61ee-473a-ab50-3d8e8ca93c08'
+  label: 'Search Button'
+  label_display: '0'
+  provider: block_content
+  status: true
+  info: ''
+  view_mode: full
+visibility: {  }

config/core.entity_form_display.user.user.default.yml

@@ -125,6 +125,11 @@ content:
   timezone:
     weight: 6
     region: content
+  translation:
+    weight: 10
+    region: content
+    settings: {  }
+    third_party_settings: {  }
   user_picture:
     type: image_image
     weight: 51

config/core.entity_view_display.user.user.compact.yml

@@ -57,3 +57,4 @@ hidden:
   field_terms_and_condition: true
   langcode: true
   member_for: true
+  search_api_excerpt: true

config/core.entity_view_display.user.user.default.yml

@@ -125,3 +125,4 @@ hidden:
   field_migrate_example_favbeers: true
   field_migrate_example_gender: true
   langcode: true
+  search_api_excerpt: true

config/core.extension.yml

@@ -49,7 +49,6 @@ module:
   file: 0
   filter: 0
   genpass: 0
-  gms_group_migrate: 0
   gms_pdflink: 0
   gms_secure_role: 0
   gms_sitename: 0
@@ -82,11 +81,6 @@ module:
   menu_link_content: 0
   menu_ui: 0
   metatag: 0
-  migrate: 0
-  migrate_drupal: 0
-  migrate_file: 0
-  migrate_plus: 0
-  migrate_tools: 0
   modules_weight: 0
   mysql: 0
   node: 0