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

Ensure that new pull request button works on forked forks owned by owner of the root and reduce ambiguity #14932

Merged
merged 4 commits into from
Mar 16, 2021
Merged

Ensure that new pull request button works on forked forks owned by owner of the root and reduce ambiguity #14932

merged 4 commits into from
Mar 16, 2021

Conversation

zeripath
Copy link
Contributor

@zeripath zeripath commented Mar 8, 2021

Prevent 404 on new pull request button on forked fork owned by the owner
of the root repository. Also ensure that the names make sense.

Fix #14921

Signed-off-by: Andrew Thornton art27@cantab.net

@zeripath
Ensure that new pull request button works on forked forks owned by ow…
8baaa8c 
…ner of the root

Prevent 404 on new pull request button on forked fork owned by the owner
of the root repository. Also ensure that the names make sense.

Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath zeripath added this to the 1.14.0 milestone Mar 8, 2021
@zeripath zeripath added the topic/ui Change the appearance of the Gitea UI label Mar 8, 2021
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Mar 8, 2021
a1012112796
a1012112796 approved these changes Mar 10, 2021
View reviewed changes
Copy link
Member

@a1012112796 a1012112796 left a comment

Choose a reason for hiding this comment

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

I see. but maybe the changes to templates/repo/diff/compare.tmp is a little different with this pr's topic. suggest do it in a new pr. Thanks

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Mar 10, 2021
@zeripath
Copy link
Contributor Author

it's actually really closely related.

@zeripath zeripath changed the title Ensure that new pull request button works on forked forks owned by owner of the root Ensure that new pull request button works on forked forks owned by owner of the root and reduce ambiguity Mar 11, 2021
@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 Mar 15, 2021
@6543
Copy link
Member

6543 commented Mar 16, 2021

🚀

@6543 6543 merged commit bf53cf0 into go-gitea:master Mar 16, 2021
@6543 6543 mentioned this pull request Mar 16, 2021
Merged
1 task
@zeripath zeripath deleted the fix-14921-compare-urls-on-forked-forks branch March 16, 2021 09:19
@go-gitea go-gitea locked and limited conversation to collaborators May 13, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@6543 6543 6543 left review comments

@lafriks lafriks lafriks approved these changes

@a1012112796 a1012112796 a1012112796 approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. topic/ui Change the appearance of the Gitea UI type/bug
Projects
None yet
Milestone
1.14.0
Development

Successfully merging this pull request may close these issues.

Ambiguous compare URL results in 404
5 participants
@zeripath @6543 @lafriks @a1012112796 @GiteaBot