-
Notifications
You must be signed in to change notification settings - Fork 1
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
401/user management for servers #532
Merged
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
…hpi-swt2/vm-portal into 401/user-management-for-servers
chrisma
reviewed
Apr 2, 2019
# Conflicts: # app/views/servers/_form.html.erb
LeonMatthes
added
Review Required
and removed
WIP
work is still in progess for this PR
labels
Apr 12, 2019
BraunTom
requested changes
Apr 12, 2019
BraunTom
approved these changes
Apr 12, 2019
chrisma
reviewed
Apr 26, 2019
chrisma
requested changes
Apr 29, 2019
chrisma
approved these changes
Apr 29, 2019
chrisma
added
merge when green
PR can be merged when all tests pass
and removed
Review Required
labels
Apr 29, 2019
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.
Closes #401
Also fixes branching in git and reading of puppet scripts