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.

Sign up for GitHub

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

Jump to bottom

Org action fixes and form cleanup #10512

Merged
merged 3 commits into from
Feb 27, 2020
Merged

Org action fixes and form cleanup #10512

merged 3 commits into from
Feb 27, 2020

Conversation

jolheiser
Copy link
Member

No description provided.

@jolheiser
More org fixes
32b5bbc 
Signed-off-by: jolheiser <john.olheiser@gmail.com>
@jolheiser jolheiser added type/bug skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. backport/v1.11 labels Feb 27, 2020
@jolheiser jolheiser added this to the 1.12.0 milestone Feb 27, 2020
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Feb 27, 2020
zeripath
zeripath approved these changes Feb 27, 2020
View reviewed changes
Copy link
Contributor

@zeripath zeripath left a comment

Choose a reason for hiding this comment

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

I'd probably prefer if the uids weren't in the query but it's fine.

@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Feb 27, 2020
@6543
Copy link
Member

6543 commented Feb 27, 2020 •
edited
Loading

I can send a patch on its own if this is merged ...?

EDIT: this is used in other action's so we can only remove it for specific actions (in template)

6543
6543 requested changes Feb 27, 2020
View reviewed changes
Copy link
Member

@6543 6543 left a comment

Choose a reason for hiding this comment

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

leave action don't need ?uid={{.ID}}

templates/user/settings/organization.tmpl Outdated Show resolved Hide resolved
@jolheiser
Copy link
Member Author

No, but if uid is 0 it will redirect.

@jolheiser
Move form action query to inputs
daf2c4e 
Signed-off-by: jolheiser <john.olheiser@gmail.com>
@jolheiser
Copy link
Member Author

Okay, PR now has form fixes, please re-review.

@jolheiser jolheiser merged commit 15fbf50 into go-gitea:master Feb 27, 2020
@jolheiser jolheiser deleted the org-member-remove branch February 27, 2020 22:00
@jolheiser jolheiser changed the title More org action fixes Org action fixes and form cleanup Feb 27, 2020
jolheiser added a commit to jolheiser/gitea that referenced this pull request Feb 27, 2020
@jolheiser
Org action fixes and form cleanup (go-gitea#10512)
a9e32e0 
* More org fixes

* Move form action query to inputs

Signed-off-by: jolheiser <john.olheiser@gmail.com>
6543
6543 reviewed Feb 27, 2020
View reviewed changes
Copy link
Member

@6543 6543 left a comment

Choose a reason for hiding this comment

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

lgtm :)

@jolheiser jolheiser mentioned this pull request Feb 27, 2020
Merged
@jolheiser jolheiser added the backport/done All backports for this PR have been created label Feb 27, 2020
jolheiser added a commit that referenced this pull request Feb 28, 2020
@jolheiser
Org action fixes and form cleanup (#10512) (#10514)
c6b78c3 
* More org fixes

* Move form action query to inputs

Signed-off-by: jolheiser <john.olheiser@gmail.com>
@zeripath zeripath added the topic/security Something leaks user information or is otherwise vulnerable. Should be fixed! label Mar 6, 2020
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@6543 6543 6543 approved these changes

@zeripath zeripath zeripath approved these changes

@guillep2k guillep2k guillep2k approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. topic/security Something leaks user information or is otherwise vulnerable. Should be fixed! type/bug
Projects
None yet
Milestone
1.12.0
Development

Successfully merging this pull request may close these issues.
5 participants
@jolheiser @6543 @zeripath @guillep2k @GiteaBot