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

Issue 5924 fix compare button #5929

Merged

Conversation

zeripath
Copy link
Contributor

@zeripath zeripath commented Feb 1, 2019

Unfortunately the changes in #5877 caused breakage of #5924.

These changes revert the changes in #5877 and prevent the 404 on compare.

It's not a complete fix for the compare button, we need to allow users to suggest their own branches.

This unfortunately was not the solution.

Signed-off-by: Andrew Thornton <art27@cantab.net>
Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath
Copy link
Contributor Author

zeripath commented Feb 1, 2019

@adelowo I think this might at least partially fix the initial issue - although there's not an obvious way of getting back to their own branches.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Feb 1, 2019
@codecov-io
Copy link

codecov-io commented Feb 1, 2019

Codecov Report

Merging #5929 into master will increase coverage by 0.02%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #5929      +/-   ##
==========================================
+ Coverage   38.66%   38.69%   +0.02%     
==========================================
  Files         330      330              
  Lines       48573    48573              
==========================================
+ Hits        18783    18793      +10     
+ Misses      27070    27059      -11     
- Partials     2720     2721       +1
Impacted Files Coverage Δ
routers/api/v1/repo/pull.go 17.13% <0%> (ø) ⬆️
routers/repo/pull.go 34.22% <0%> (ø) ⬆️
routers/repo/view.go 47.3% <0%> (+1.19%) ⬆️
models/repo_permission.go 70.98% <0%> (+2.46%) ⬆️
models/unit.go 14.28% <0%> (+14.28%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 01c10a9...db0a4bb. Read the comment docs.

@techknowlogick techknowlogick added this to the 1.8.0 milestone Feb 2, 2019
@techknowlogick techknowlogick added the topic/ui Change the appearance of the Gitea UI label Feb 2, 2019
@adelowo
Copy link
Member

adelowo commented Feb 2, 2019

I will take a look

@zeripath
Copy link
Contributor Author

zeripath commented Feb 2, 2019

Basically what we need to do is to a) make it clearer which repositories they're comparing and then allow them to suggest other repositories which on pressing enter should redirect to the appropriate URL.

@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 Feb 3, 2019
@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 3, 2019
@adelowo
Copy link
Member

adelowo commented Feb 4, 2019

Anything else to do here ?

@techknowlogick techknowlogick merged commit 24a36e8 into go-gitea:master Feb 4, 2019
@zeripath zeripath deleted the issue-5924-fix-compare-button branch February 4, 2019 00:56
@lafriks
Copy link
Member

lafriks commented Feb 4, 2019

please backport to release/v1.7 branch

@jolheiser jolheiser mentioned this pull request Feb 7, 2019
7 tasks
zeripath added a commit to zeripath/gitea that referenced this pull request Feb 16, 2019
* Revert go-gitea#5877

This unfortunately was not the solution.

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

* Change permission check to create pull requests to CanReadIssuesOrPulls

Signed-off-by: Andrew Thornton <art27@cantab.net>
lafriks pushed a commit that referenced this pull request Feb 16, 2019
* Revert #5877

This unfortunately was not the solution.

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

* Change permission check to create pull requests to CanReadIssuesOrPulls

Signed-off-by: Andrew Thornton <art27@cantab.net>
@lafriks lafriks added the backport/done All backports for this PR have been created label Feb 16, 2019
@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.
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. topic/ui Change the appearance of the Gitea UI type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants