-
Notifications
You must be signed in to change notification settings - Fork 29
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
Add branching section into CONTRIBUTING.md - Merge in develop #286
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* removed hardcoded URL * Removed unnecessary endpoint
…ING.md Image source: https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow. License checked
Describe the use of Gitflow in SonarQuest
aiakide
changed the title
Add branching section into CONTRIBUTING.md
Add branching section into CONTRIBUTING.md - Merge in develop
Mar 24, 2021
Christoph-Meyer
added a commit
that referenced
this pull request
Mar 25, 2021
* Add branching section into CONTRIBUTING.md - Merge in develop (#286) * Clean up (#282) * removed hardcoded URL * Removed unnecessary endpoint * Add illustrations for feature and hotfix branches to use in CONTRIBUTING.md Image source: https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow. License checked * Add branching section into to use in CONTRIBUTING.md Describe the use of Gitflow in SonarQuest Co-authored-by: Michael Landreh <[email protected]> * Fix #270 - Password is returned (#287) * Change input color of login input fields * Add necessary fields into UserDto * Fix Nullpointer Exceptions in world service This occurs when a world should be found by an id that is null * Change return type of 'getUser' and 'users' into UserDto * Adjust getUser to be null safe Co-authored-by: Nils <[email protected]> Co-authored-by: Michael Landreh <[email protected]>
Christoph-Meyer
added a commit
that referenced
this pull request
Mar 25, 2021
* Add branching section into CONTRIBUTING.md - Merge in develop (#286) * Clean up (#282) * removed hardcoded URL * Removed unnecessary endpoint * Add illustrations for feature and hotfix branches to use in CONTRIBUTING.md Image source: https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow. License checked * Add branching section into to use in CONTRIBUTING.md Describe the use of Gitflow in SonarQuest Co-authored-by: Michael Landreh <[email protected]> * Fix #270 - Password is returned (#287) * Change input color of login input fields * Add necessary fields into UserDto * Fix Nullpointer Exceptions in world service This occurs when a world should be found by an id that is null * Change return type of 'getUser' and 'users' into UserDto * Adjust getUser to be null safe Co-authored-by: Nils <[email protected]> Co-authored-by: Michael Landreh <[email protected]>
Christoph-Meyer
added a commit
that referenced
this pull request
Mar 25, 2021
* Add branching section into CONTRIBUTING.md - Merge in develop (#286) * Clean up (#282) * removed hardcoded URL * Removed unnecessary endpoint * Add illustrations for feature and hotfix branches to use in CONTRIBUTING.md Image source: https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow. License checked * Add branching section into to use in CONTRIBUTING.md Describe the use of Gitflow in SonarQuest Co-authored-by: Michael Landreh <[email protected]> * Fix #270 - Password is returned (#287) * Change input color of login input fields * Add necessary fields into UserDto * Fix Nullpointer Exceptions in world service This occurs when a world should be found by an id that is null * Change return type of 'getUser' and 'users' into UserDto * Adjust getUser to be null safe * Fixed Issue#290 Co-authored-by: Nils <[email protected]> Co-authored-by: Michael Landreh <[email protected]>
Christoph-Meyer
added a commit
that referenced
this pull request
Aug 27, 2021
* Add branching section into CONTRIBUTING.md - Merge in develop (#286) * Clean up (#282) * removed hardcoded URL * Removed unnecessary endpoint * Add illustrations for feature and hotfix branches to use in CONTRIBUTING.md Image source: https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow. License checked * Add branching section into to use in CONTRIBUTING.md Describe the use of Gitflow in SonarQuest Co-authored-by: Michael Landreh <[email protected]> * Fix #270 - Password is returned (#287) * Change input color of login input fields * Add necessary fields into UserDto * Fix Nullpointer Exceptions in world service This occurs when a world should be found by an id that is null * Change return type of 'getUser' and 'users' into UserDto * Adjust getUser to be null safe * Fixed Issue#290 * 0.8.6-SNAPSHOT * Sonarlint Cleanup * Sonarlint Cleanup Co-authored-by: Nils <[email protected]> Co-authored-by: Michael Landreh <[email protected]>
Christoph-Meyer
added a commit
that referenced
this pull request
Oct 11, 2024
* Add branching section into CONTRIBUTING.md - Merge in develop (#286) * Clean up (#282) * removed hardcoded URL * Removed unnecessary endpoint * Add illustrations for feature and hotfix branches to use in CONTRIBUTING.md Image source: https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow. License checked * Add branching section into to use in CONTRIBUTING.md Describe the use of Gitflow in SonarQuest Co-authored-by: Michael Landreh <[email protected]> * Fix #270 - Password is returned (#287) * Change input color of login input fields * Add necessary fields into UserDto * Fix Nullpointer Exceptions in world service This occurs when a world should be found by an id that is null * Change return type of 'getUser' and 'users' into UserDto * Adjust getUser to be null safe * Fixed Issue#290 * 0.8.6-SNAPSHOT * Sonarlint Cleanup * Sonarlint Cleanup * Feature/optimize css (#285) * Clean up (#282) * removed hardcoded URL * Removed unnecessary endpoint * Paar kleine Aenderungen für potentielle Optimierungen * Hopefully fixed package-lock.json to fit regular package file * Added the missing main components * WIP Co-authored-by: Sascha <[email protected]> * Version der ajv-Dependency geändert. * package-lock nachgepflegt. * Node Version im GitHub-Action-Skript angepasst. * Weitere Anpassungen an der Github-Action * Configuration für Produktion angepasst * Node Version nochmal angepasst * Änderungen teilweise zurück gerollt und Abhängigkeiten ausgebaut. --------- Co-authored-by: Nils <[email protected]> Co-authored-by: Michael Landreh <[email protected]> Co-authored-by: MeC <[email protected]> Co-authored-by: Sascha <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
After updating CONTRIBUTING.md in the master branch, the changes must also be merged into the develop branch to provide a consistent basis for further feature development and bug fixing.