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

Move diff split code into own template file #13919

Merged
merged 3 commits into from
Dec 10, 2020

Conversation

mrsdizzie
Copy link
Member

Separate split diff view same as unified already is. Mainly because I'm working on a separate PR with this change and merge conflicts for each change to box.tmpl are annoying and I'm worried about breaking something subtle while trying to resolve them.

Separate split diff view same as unified already is. Mainly because I'm working on a separate PR with this change and merge conflicts for each change to box.tmpl are annoying and I'm worried about breaking something subtle while trying to resolve them.
@codecov-io
Copy link

codecov-io commented Dec 9, 2020

Codecov Report

Merging #13919 (cfbee9c) into master (c85bb62) will increase coverage by 0.10%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #13919      +/-   ##
==========================================
+ Coverage   42.11%   42.22%   +0.10%     
==========================================
  Files         710      710              
  Lines       77227    77227              
==========================================
+ Hits        32527    32610      +83     
+ Misses      39350    39252      -98     
- Partials     5350     5365      +15     
Impacted Files Coverage Δ
models/repo_mirror.go 2.38% <0.00%> (-11.91%) ⬇️
modules/cron/tasks_basic.go 87.35% <0.00%> (-3.45%) ⬇️
services/mirror/mirror.go 15.78% <0.00%> (-1.11%) ⬇️
modules/git/repo.go 45.72% <0.00%> (-1.01%) ⬇️
models/gpg_key.go 53.33% <0.00%> (-0.58%) ⬇️
models/error.go 39.31% <0.00%> (+0.32%) ⬆️
services/pull/pull.go 40.68% <0.00%> (+0.49%) ⬆️
services/pull/check.go 51.82% <0.00%> (+0.72%) ⬆️
models/notification.go 67.24% <0.00%> (+0.98%) ⬆️
services/gitdiff/gitdiff.go 70.98% <0.00%> (+1.93%) ⬆️
... and 8 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 c85bb62...cfbee9c. Read the comment docs.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Dec 9, 2020
@mrsdizzie mrsdizzie added the topic/ui Change the appearance of the Gitea UI label Dec 9, 2020
@mrsdizzie mrsdizzie added this to the 1.14.0 milestone Dec 9, 2020
@silverwind
Copy link
Member

Getting this error:

template: repo/diff/comments:3:45: executing "repo/diff/comments" at <$.root.Lang>: invalid value; expected string

@mrsdizzie
Copy link
Member Author

Getting this error:

template: repo/diff/comments:3:45: executing "repo/diff/comments" at <$.root.Lang>: invalid value; expected string

Thats what I'm talking about : ) Fixed 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 Dec 9, 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 Dec 10, 2020
@techknowlogick
Copy link
Member

🚀

@techknowlogick techknowlogick merged commit e63a041 into go-gitea:master Dec 10, 2020
@go-gitea go-gitea locked and limited conversation to collaborators Jan 18, 2021
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. topic/ui Change the appearance of the Gitea UI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants