Skip to content

Commit

Permalink
Merge branch 'develop' into foia-ws-426-xml-upload-reset-command
Browse files Browse the repository at this point in the history
  • Loading branch information
ameshkin authored Dec 14, 2023
2 parents 7331520 + 3398213 commit 7b01ee2
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 35 deletions.
5 changes: 4 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,9 @@
},
"drupal/maillog": {
"Fix Maillog": "https://www.drupal.org/files/issues/2023-01-12/maillog_3259616-15.patch"
},
"drupal/samlauth": {
"Add option to show SAML link on user login page": "https://git.drupalcode.org/project/samlauth/-/merge_requests/13.patch"
}
},
"installer-types": [
Expand Down Expand Up @@ -227,7 +230,7 @@
"url": "https://asset-packagist.org"
},
"drupal/form_mode_manager": {
"type": "vcs",
"type": "vcs",
"url": "https://git.drupalcode.org/issue/form_mode_manager-3297262.git",
"canonical": false
},
Expand Down
66 changes: 34 additions & 32 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions drush.wrapper
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
cd "`dirname $0`"

if [ ! -f "${DIR}/vendor/drush/drush/drush.launcher" ]; then
if [ ! -f "${DIR}/vendor/bin/drush" ]; then
echo >&2 "Drush was not found in this project's vendor directory. You can install it by typing:"
echo >&2 "composer install"
exit 1
fi

vendor/drush/drush/drush.launcher --config="${DIR}/drush/drushrc.php" --alias-path="${DIR}/drush/site-aliases" "$@"
vendor/bin/drush --config="${DIR}/drush/drushrc.php" --alias-path="${DIR}/drush/site-aliases" "$@"

0 comments on commit 7b01ee2

Please sign in to comment.