Skip to content

Fixes diff on merged pull requests #7171

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
Merged
merged 5 commits into from
Jun 11, 2019
Merged

Fixes diff on merged pull requests #7171

merged 5 commits into from
Jun 11, 2019

Conversation

saitho
Copy link
Contributor

@saitho saitho commented Jun 10, 2019

Resolves #7170.

@saitho
Fixes diff on merged pull requests
1b3f126 
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
@lunny
Copy link
Member

lunny commented Jun 10, 2019

CI failed.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jun 10, 2019
@lunny lunny added the type/bug label Jun 10, 2019
@lunny lunny added this to the 1.9.0 milestone Jun 10, 2019
saitho added 2 commits June 10, 2019 17:01
@saitho
Get merge info from remote branch before base branch
a35a295 
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
@saitho
Properly generate remoteBranch name used within GetCompareInfo
2057bf0 
Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
@saitho saitho mentioned this pull request Jun 10, 2019
Merged
@saitho
Copy link
Contributor Author

saitho commented Jun 10, 2019

Can someone restart CI? :)

@techknowlogick
Copy link
Member

@saitho restarted.

@codecov-io
Copy link

Codecov Report

Merging #7171 into master will increase coverage by <.01%.
The diff coverage is 91.66%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #7171      +/-   ##
==========================================
+ Coverage   41.73%   41.74%   +<.01%     
==========================================
  Files         449      449              
  Lines       61112    61112              
==========================================
+ Hits        25505    25509       +4     
+ Misses      32294    32291       -3     
+ Partials     3313     3312       -1
Impacted Files Coverage Δ
models/pull.go 49.76% <0%> (ø) ⬆️
modules/git/repo_compare.go 66.66% <100%> (ø) ⬆️
routers/repo/pull.go 31.05% <100%> (ø) ⬆️
models/repo_list.go 72.08% <0%> (-1.02%) ⬇️
models/gpg_key.go 56.66% <0%> (+0.83%) ⬆️
modules/log/event.go 65.98% <0%> (+1.52%) ⬆️

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 b3b4684...f63bc2c. Read the comment docs.

@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 Jun 11, 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 Jun 11, 2019
@techknowlogick techknowlogick merged commit 1608f63 into go-gitea:master Jun 11, 2019
@saitho saitho deleted the bugfix/7170-Fixes_changed_files_on_merged_prs branch June 27, 2019 10:40
jeffliu27 pushed a commit to jeffliu27/gitea that referenced this pull request Jul 18, 2019
@saitho @jeffliu27
Fixes diff on merged pull requests (go-gitea#7171)
7247bea
@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

@lunny lunny lunny approved these changes

+1 more reviewer

@zeripath zeripath zeripath approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Milestone
1.9.0
Development

Successfully merging this pull request may close these issues.

Merged pull request's files changed N/A
6 participants
@saitho @lunny @techknowlogick @codecov-io @zeripath @GiteaBot