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

Fixed wrong AppSubUrl in multiple templates #10447

Merged
merged 3 commits into from
Feb 25, 2020
Merged

Fixed wrong AppSubUrl in multiple templates #10447

merged 3 commits into from
Feb 25, 2020

Conversation

philippbeckmann
Copy link
Contributor

@philippbeckmann philippbeckmann commented Feb 24, 2020

When run behind a reverse proxy in a sub-path, an oauth2 application can be added, but not edited.

This is because the $.AppSubURL in the form-action of the edit template does not include the sub-path. I replaced it with AppSubUrl, which includes it.

PS: The template files \templates\explore\code.tmpl and \templates\repo\settings\lfs_locks.tmpl also utilize $.AppSubURL, which might fail in this configuration.

@6543
Copy link
Member

6543 commented Feb 24, 2020

CI failure looks unrelated ...
@philippbeckmann cant find this in \templates\repo\settings\lfs_locks.tmpl but can you change code.tmpl too?

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Feb 24, 2020
@philippbeckmann philippbeckmann changed the title Fixed wrong AppSubUrl in OAuth2 app edit page Fixed wrong AppSubUrl in multiple templates Feb 24, 2020
@philippbeckmann
Copy link
Contributor Author

@6543 I replaced the other occurences of $.AppSubURL in the mentioned files.

@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 24, 2020
@codecov-io
Copy link

Codecov Report

Merging #10447 into master will increase coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #10447      +/-   ##
==========================================
+ Coverage   43.68%   43.69%   +0.01%     
==========================================
  Files         586      586              
  Lines       81389    81389              
==========================================
+ Hits        35552    35566      +14     
+ Misses      41433    41424       -9     
+ Partials     4404     4399       -5
Impacted Files Coverage Δ
services/pull/temp_repo.go 29.05% <0%> (-2.57%) ⬇️
services/pull/patch.go 60.37% <0%> (-2.52%) ⬇️
modules/queue/unique_queue_disk_channel.go 53.84% <0%> (-1.93%) ⬇️
models/gpg_key.go 54.81% <0%> (-0.56%) ⬇️
models/error.go 29.23% <0%> (+0.51%) ⬆️
services/pull/pull.go 36.07% <0%> (+0.87%) ⬆️
modules/git/repo.go 47.7% <0%> (+0.91%) ⬆️
services/pull/check.go 53.04% <0%> (+2.43%) ⬆️
modules/git/command.go 89.56% <0%> (+2.6%) ⬆️
modules/process/manager.go 78.31% <0%> (+3.61%) ⬆️
... and 3 more

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 0eeee9c...d9ad2ce. Read the comment docs.

@jolheiser jolheiser added this to the 1.12.0 milestone Feb 24, 2020
@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 25, 2020
@jolheiser
Copy link
Member

Ping lgtm

@jolheiser jolheiser merged commit bab6e1e into go-gitea:master Feb 25, 2020
@philippbeckmann philippbeckmann deleted the fix-oauth2-app-edit branch February 25, 2020 16:03
@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
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants