Merge pull request #476 from City-of-Helsinki/update-configuration

Automatic update
City-of-Helsinki · Nov 16, 2023 · 1bf1536 · 1bf1536
2 parents 18f78a4 + a7acb98
commit 1bf1536
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 42 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/config_ignore.settings.yml b/conf/cmi/config_ignore.settings.yml
@@ -1,5 +1,6 @@
 _core:
   default_config_hash: UVH1aJ4b44UM-VdPVN7hNNuuVqfReJxwfVeDQH1Hvsk
+mode: simple
 ignored_config_entities:
   - 'easy_breadcrumb.settings:home_segment_title'
   - 'field.storage.paragraph.field_calculator:settings.allowed_values'

diff --git a/tools/commit-msg b/tools/commit-msg
@@ -4,12 +4,13 @@
 # feature/PROJECT-1234-test-test
 # PROJECT-1234-test-test
 # PROJECT-1234_test_test
+# fixup! (for git rebase --autosquash)
 id=$(echo `git rev-parse --abbrev-ref HEAD` | sed -nE 's|([a-z]+/)?([A-Z]+-[0-9]+)(-.+)?(_.+)?|\2|p')
 COMMIT_MESSAGE=$(cat $1)
 
 # Only prepare commit message if pattern matched and Jira ID was found and
 # message doesn't contain Jira ID already.
-if [[ ! -z $id ]] && [[ $COMMIT_MESSAGE != $id* ]]; then
+if [[ ! -z $id ]] && [[ $COMMIT_MESSAGE != $id* ]] && [[ $COMMIT_MESSAGE != "fixup!"* ]]; then
   # $1 is the name of the file containing the commit message
   # Prepend "ABCD-123: "
   sed -i.bak -E "1s/^/${id}: /" $1