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

Add branching section into CONTRIBUTING.md - Merge in develop #286

Merged
merged 3 commits into from
Mar 24, 2021

Conversation

aiakide
Copy link
Collaborator

@aiakide aiakide commented Mar 24, 2021

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.

surfermicha and others added 3 commits March 19, 2021 08:30
@aiakide aiakide changed the title Add branching section into CONTRIBUTING.md Add branching section into CONTRIBUTING.md - Merge in develop Mar 24, 2021
@surfermicha surfermicha merged commit 0d12189 into develop Mar 24, 2021
@surfermicha surfermicha deleted the hotfix/add-gitflow branch March 24, 2021 12:38
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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants