From 94752152a450c31bed14c182eeb68b79cdffea5c Mon Sep 17 00:00:00 2001 From: Eduard Heimbuch Date: Mon, 28 Oct 2019 09:34:21 +0100 Subject: [PATCH 1/2] Improve NoChangesMade-Exception Description --- scm-webapp/src/main/resources/locales/de/plugins.json | 2 +- scm-webapp/src/main/resources/locales/en/plugins.json | 2 +- scm-webapp/src/main/resources/locales/es/plugins.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scm-webapp/src/main/resources/locales/de/plugins.json b/scm-webapp/src/main/resources/locales/de/plugins.json index 41e5737503..2e36e60312 100644 --- a/scm-webapp/src/main/resources/locales/de/plugins.json +++ b/scm-webapp/src/main/resources/locales/de/plugins.json @@ -174,7 +174,7 @@ }, "40RaYIeeR1": { "displayName": "Es wurden keine Änderungen durchgeführt", - "description": "Das Repository wurde nicht verändert. Daher konnte kein neuer Commit erzeugt werden." + "description": "Das Repository wurde nicht verändert. Daher konnte kein neuer Commit erzeugt werden. Womöglich werden Änderungen aufgrund einer .ignore-Datei Definition nicht berücksichtigt." }, "4iRct4avG1": { "displayName": "Die Revisionen haben keinen gemeinsamen Ursprung", diff --git a/scm-webapp/src/main/resources/locales/en/plugins.json b/scm-webapp/src/main/resources/locales/en/plugins.json index 77f8d2f4b9..11643c4a70 100644 --- a/scm-webapp/src/main/resources/locales/en/plugins.json +++ b/scm-webapp/src/main/resources/locales/en/plugins.json @@ -174,7 +174,7 @@ }, "40RaYIeeR1": { "displayName": "No changes were made", - "description": "No changes were made to the files of the repository. Therefor no new commit could be created." + "description": "No changes were made to the files of the repository. Therefor no new commit could be created. Possibly changes cannot be applied due to an .ignore-File definition." }, "4iRct4avG1": { "displayName": "The revisions have unrelated histories", diff --git a/scm-webapp/src/main/resources/locales/es/plugins.json b/scm-webapp/src/main/resources/locales/es/plugins.json index cef33f6007..e56973946b 100644 --- a/scm-webapp/src/main/resources/locales/es/plugins.json +++ b/scm-webapp/src/main/resources/locales/es/plugins.json @@ -174,7 +174,7 @@ }, "40RaYIeeR1": { "displayName": "No se han efectuado modificaciones.", - "description": "Ningún fichero del repositorio ha sido modificado. Por lo tanto, no se confirmará ninguna modificación." + "description": "Ningún fichero del repositorio ha sido modificado. Por lo tanto, no se confirmará ninguna modificación. Los cambios podrían no tener debido a una definición .ignore" } }, "namespaceStrategies": { From fc45c376e11e74913338b924d77a940dd2c0f092 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Mon, 28 Oct 2019 09:54:52 +0000 Subject: [PATCH 2/2] Close branch bugfix/no_changes_made_exception