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 auth.okta to rendered grafana.ini #612

Merged
merged 4 commits into from
Nov 29, 2021

Conversation

jaredstehler
Copy link
Contributor

Description

It seems after a refactor of grafana.ini rendering, the section renderer for auth.okta was missed.

@HVBE
Copy link
Collaborator

HVBE commented Nov 18, 2021

Hey @jaredstehler , can you rebase this PR? thanks! :)

@jaredstehler
Copy link
Contributor Author

should be set now?

Copy link
Collaborator

@HVBE HVBE left a comment

Choose a reason for hiding this comment

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

Looks good to me, thanks for contributing! @jaredstehler 👍

@HVBE
Copy link
Collaborator

HVBE commented Nov 26, 2021

Ahh.. Another rebase please? @jaredstehler
(apologies, not sure why github keeps asking for rebases when the files were unaffected)

@NissesSenap
Copy link
Collaborator

@HubertStefanski it's a setting that I have done that forces all PR:s to be up to date compared to the latest in the master branch. The reason is so we are 100% sure that the PR won't create any issues with something else, It will also make it possible for us to know that the CI pipelines will be working together with everything in the master branch.

@jaredstehler you will have to rebase this PR. Normally us as maintainers can do it but I don't think you gave that access when creating your PR: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork

I noticed this when I cloned down your fork and tried to push to it. To make it easier for us to do please give us as maintainers that access or you will have to keep the PR up to date so we can merge it.

@jaredstehler
Copy link
Contributor Author

i've rebased; unfortunately it seems GitHub doesn't allow granting such permissions on forks owned by an "org" account, which this one is. In the future i'll fork from my user account.

@NissesSenap NissesSenap merged commit 3aac2f0 into grafana:master Nov 29, 2021
@NissesSenap
Copy link
Collaborator

Okay good to know. Thanks for the pr @jaredstehler!
Nice to have this done, I have a bug fix that needs to get out and this so I will create a new release the coming days and this PR will of course be included.

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.

None yet

3 participants