Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Check revision on commit #41

Merged
merged 6 commits into from
Oct 20, 2021
Merged

Conversation

pfeuffer
Copy link
Member

@pfeuffer pfeuffer commented Sep 3, 2021

Proposed changes

In the code editor there will be checks on refocus, whether the latest revision of the branch (or the repository if there are no branches) has changed. In this case, the user will get a warning and the commit button will stay disabled. If the user commits a file without noticing changes in the repository, the server will reject the change and a "concurrent modification error" will be shown.

This feature works with SCM-Manager 2.23.0 or later, but does not need this version. So the required SCM-Manager version has not been changed for this feature.

Your checklist for this pull request

Put an x in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.

Contributor:

  • PR is well described and the description can be used as a commit message on squash
  • Changelog entry file created in gradle/changelog or CHANGELOG.md is updated for plugins
  • Feature has been tested with different permissions
  • Documentation updated (only necessary for new features or changed behaviour)

Reviewer:

  • The clean code principles are respected (CleanCode)
  • All new code/logic is implemented on the right spot / "Should this be done here?"
  • UI changes fits into the layout
  • The UI views / components are responsive (mobile views)
  • Correct translations are available

Checklist for branch merge request (not required for forks)

@pfeuffer pfeuffer force-pushed the feature/check_revision_on_commit branch 2 times, most recently from a5d848c to b83846c Compare September 6, 2021 08:21
@pfeuffer pfeuffer force-pushed the feature/check_revision_on_commit branch from 37a4fb8 to b41da79 Compare September 8, 2021 12:28
@pfeuffer pfeuffer marked this pull request as ready for review September 8, 2021 13:08
@@ -27,7 +27,8 @@
"subtitle": "Datei Editor",
"selectedBranch": "Ausgewählter Branch",
"notEditable": "Dateien diesen Typs können innerhalb des SCM-Managers nicht bearbeitet werden",
"placeholder": "Hier können Sie Ihre Datei schreiben"
"placeholder": "Hier können Sie Ihre Datei schreiben",
"revisionChanged": "Die aktuelle Revision hat sich geändert. Kopieren Sie ihre Änderungen und aktualisieren Sie die Seite, um die letzte Version der Datei zu erhalten."
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"revisionChanged": "Die aktuelle Revision hat sich geändert. Kopieren Sie ihre Änderungen und aktualisieren Sie die Seite, um die letzte Version der Datei zu erhalten."
"revisionChanged": "Die aktuelle Revision hat sich geändert. Kopieren Sie Ihre Änderungen und aktualisieren Sie die Seite, um die letzte Version der Datei zu erhalten."

@Pilopa Pilopa merged commit 5c0d516 into develop Oct 20, 2021
@Pilopa Pilopa deleted the feature/check_revision_on_commit branch October 20, 2021 11:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants