Skip to content

Commit

Permalink
Merge branch 'develop' into feature/SD-361-admin-audit-cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
sharmasahil committed Dec 9, 2024
2 parents 6483928 + 667ea91 commit 3c4380e
Show file tree
Hide file tree
Showing 51 changed files with 3,761 additions and 235 deletions.
102 changes: 0 additions & 102 deletions .circleci/config.yml

This file was deleted.

21 changes: 0 additions & 21 deletions .circleci/merge-to-reference.sh

This file was deleted.

24 changes: 0 additions & 24 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,34 +5,10 @@ on:
workflow_dispatch:

jobs:
set_status_in_progress:
name: set_status_in_progress
if: always()
uses: dpc-sdp/github-actions/.github/workflows/[email protected]
secrets: inherit
with:
context: 'tide_build'
description: 'Tide Build running...'
state: 'pending'
target_url: ${{ github.event.repository.html_url }}/actions/runs/${{ github.run_id }}
tide_build:
name: tide_build
secrets: inherit
uses: dpc-sdp/github-actions/.github/workflows/[email protected]
with:
module_build: true
runner: biggy-tide
export_config:
name: export_config
secrets: inherit
uses: dpc-sdp/github-actions/.github/workflows/[email protected]
set_status:
name: set_status
needs: [tide_build]
if: always()
uses: dpc-sdp/github-actions/.github/workflows/[email protected]
secrets: inherit
with:
context: 'tide_build'
description: 'Tide Build'
target_url: ${{ github.event.repository.html_url }}/actions/runs/${{ github.run_id }}
21 changes: 21 additions & 0 deletions .github/workflows/pull-request-reviewer-reminder.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: 'Close stale issues and PRs'
on:
workflow_dispatch:
schedule:
- cron: '30 1 * * *'

permissions:
contents: write # only for delete-branch option
issues: write
pull-requests: write

jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v9
with:
exempt-pr-labels: "DO NOT MERGE"
stale-issue-message: 'This issue is stale because it has been open 28 days with no activity. Remove stale label or comment or this will be closed in 14 days.'
days-before-stale: 28
days-before-close: 14
9 changes: 5 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"drupal/maxlength": "^2.1",
"drupal/entity_hierarchy": "4.x",
"drupal/elasticsearch_connector": "^7.0",
"drupal/search_api": "^1.11",
"drupal/search_api": "^1.36",
"drupal/data_pipelines": "1.0.0-alpha22",
"drupal/data_pipelines_elasticsearch": "^1.0@alpha",
"drupal/key": "^1.17",
Expand Down Expand Up @@ -69,7 +69,7 @@
"drupal/viewsreference": "^2.0@beta",
"drupal/workbench": "^1.4",
"drupal/dynamic_entity_reference": "^3.0",
"drupal/scheduled_transitions": "^2.3",
"drupal/scheduled_transitions": "2.5",
"drupal/link_field_autocomplete_filter": "^2.0",
"drupal/queue_mail": "^1.5",
"drupal/token": "^1.15",
Expand Down Expand Up @@ -406,7 +406,7 @@
"[UX] Add the ability to hide or disable the import CSV option - https://www.drupal.org/project/tablefield/issues/2337743": "https://www.drupal.org/files/issues/2020-11-11/tablefield-allowed_data_sources-2337743-16.patch"
},
"drupal/search_api": {
"Provide drush support to index a specific entity - https://www.drupal.org/project/search_api/issues/3016809": "https://www.drupal.org/files/issues/2020-02-08/search_api-index-specific-items-3016809-09.patch"
"Provide drush support to index a specific entity - https://www.drupal.org/project/search_api/issues/3016809": "https://www.drupal.org/files/issues/2024-11-25/search_api-index-specific-items-3016809-10.patch"
},
"drupal/key": {
"KeyProviderInterface::getKeyValue() doesn't always return a string - https://www.drupal.org/project/key/issues/3356052#comment-15030602": "https://git.drupalcode.org/project/key/-/merge_requests/11/diffs.patch",
Expand Down Expand Up @@ -464,7 +464,8 @@
},
"config": {
"allow-plugins": {
"composer/installers": true
"composer/installers": true,
"oomphinc/composer-installers-extender": true
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ dependencies:
- field.field.taxonomy_term.sites.field_bottom_corner_graphic
- field.field.taxonomy_term.sites.field_print_friendly_logo
- field.field.taxonomy_term.sites.field_prominence_ack_to_country
- field.field.taxonomy_term.sites.field_show_exit_site_specific
- field.field.taxonomy_term.sites.field_show_table_of_contents
- field.field.taxonomy_term.sites.field_site_domains
- field.field.taxonomy_term.sites.field_site_favicon
Expand Down Expand Up @@ -47,7 +48,7 @@ third_party_settings:
label: 'Table of contents'
region: content
parent_name: ''
weight: 18
weight: 19
format_type: details
format_settings:
classes: ''
Expand All @@ -62,7 +63,7 @@ third_party_settings:
label: 'Site theme values'
region: content
parent_name: ''
weight: 19
weight: 20
format_type: details
format_settings:
classes: ''
Expand All @@ -77,7 +78,7 @@ third_party_settings:
label: 'Site feature flag values'
region: content
parent_name: ''
weight: 20
weight: 21
format_type: details
format_settings:
classes: ''
Expand All @@ -92,7 +93,7 @@ third_party_settings:
label: 'Site favicon value'
region: content
parent_name: ''
weight: 21
weight: 22
format_type: details
format_settings:
classes: ''
Expand All @@ -108,7 +109,7 @@ third_party_settings:
label: 'Site header corner graphics'
region: content
parent_name: ''
weight: 22
weight: 23
format_type: details
format_settings:
classes: ''
Expand All @@ -124,7 +125,7 @@ mode: default
content:
field_acknowledgement_to_country:
type: string_textarea
weight: 12
weight: 13
region: content
settings:
rows: 5
Expand Down Expand Up @@ -155,12 +156,18 @@ content:
third_party_settings: { }
field_prominence_ack_to_country:
type: string_textarea
weight: 13
weight: 14
region: content
settings:
rows: 5
placeholder: ''
third_party_settings: { }
field_show_exit_site_specific:
type: options_select
weight: 12
region: content
settings: { }
third_party_settings: { }
field_show_table_of_contents:
type: boolean_checkbox
weight: 17
Expand Down Expand Up @@ -266,7 +273,7 @@ content:
third_party_settings: { }
field_site_og_image:
type: entity_browser_entity_reference
weight: 14
weight: 15
region: content
settings:
entity_browser: tide_image_browser
Expand Down Expand Up @@ -296,7 +303,7 @@ content:
third_party_settings: { }
field_site_social_links:
type: link_default
weight: 16
weight: 17
region: content
settings:
placeholder_url: 'https://example.com/Social'
Expand All @@ -323,7 +330,7 @@ content:
third_party_settings: { }
field_site_twitter_image:
type: entity_browser_entity_reference
weight: 15
weight: 16
region: content
settings:
entity_browser: tide_image_browser
Expand Down Expand Up @@ -362,7 +369,7 @@ content:
third_party_settings: { }
status:
type: boolean_checkbox
weight: 17
weight: 18
region: content
settings:
display_label: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ dependencies:
- field.field.taxonomy_term.sites.field_additional_comment
- field.field.taxonomy_term.sites.field_print_friendly_logo
- field.field.taxonomy_term.sites.field_prominence_ack_to_country
- field.field.taxonomy_term.sites.field_show_exit_site_specific
- field.field.taxonomy_term.sites.field_show_table_of_contents
- field.field.taxonomy_term.sites.field_site_domains
- field.field.taxonomy_term.sites.field_site_footer_logos
Expand Down Expand Up @@ -53,6 +54,13 @@ content:
third_party_settings: { }
weight: 12
region: content
field_show_exit_site_specific:
type: list_default
label: above
settings: { }
third_party_settings: { }
weight: 11
region: content
field_show_table_of_contents:
type: boolean
label: above
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
langcode: en
status: true
dependencies:
config:
- field.storage.taxonomy_term.field_show_exit_site_specific
- taxonomy.vocabulary.sites
module:
- options
id: taxonomy_term.sites.field_show_exit_site_specific
field_name: field_show_exit_site_specific
entity_type: taxonomy_term
bundle: sites
label: 'Show Quick exit button on pages in this site section?'
description: 'You can turn the Quick exit button on or off for a site section only, separate from the setting for the whole site.'
required: false
translatable: false
default_value: { }
default_value_callback: ''
settings: { }
field_type: list_string
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ dependencies:
config:
- field.storage.taxonomy_term.field_site_show_exit_site
- taxonomy.vocabulary.sites
_core:
default_config_hash: H4XsO_lcSpmN8fpKEaZh7KoUvvK8Ajfg5hOdosU4VKs
id: taxonomy_term.sites.field_site_show_exit_site
field_name: field_site_show_exit_site
entity_type: taxonomy_term
bundle: sites
label: 'Show Exit Site?'
label: 'Show Quick exit button sitewide?'
description: ''
required: false
translatable: false
Expand Down
Loading

0 comments on commit 3c4380e

Please sign in to comment.