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

fix message key #13240

Merged
merged 3 commits into from
Oct 21, 2020
Merged

fix message key #13240

merged 3 commits into from
Oct 21, 2020

Conversation

kzmi
Copy link
Contributor

@kzmi kzmi commented Oct 21, 2020

Message key repo.editor.rebase_conflict and repo.editor.rebase_conflict_summary don't exist in the message ini file.

repo.pulls.rebase_conflict and repo.pulls.rebase_conflict_summary would be correct.

Copy link
Contributor

@zeripath zeripath left a comment

Choose a reason for hiding this comment

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

Sorry

@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Oct 21, 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 Oct 21, 2020
@techknowlogick techknowlogick added this to the 1.14.0 milestone Oct 21, 2020
@techknowlogick techknowlogick added type/bug modifies/translation skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. labels Oct 21, 2020
@6543

This comment has been minimized.

@codecov-io
Copy link

Codecov Report

Merging #13240 into master will decrease coverage by 0.00%.
The diff coverage is 0.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #13240      +/-   ##
==========================================
- Coverage   42.21%   42.20%   -0.01%     
==========================================
  Files         683      683              
  Lines       75458    75458              
==========================================
- Hits        31851    31845       -6     
- Misses      38382    38387       +5     
- Partials     5225     5226       +1     
Impacted Files Coverage Δ
routers/repo/pull.go 31.77% <0.00%> (ø)
modules/indexer/stats/db.go 52.17% <0.00%> (-17.40%) ⬇️
modules/git/utils.go 73.77% <0.00%> (-3.28%) ⬇️
modules/queue/workerpool.go 58.77% <0.00%> (-1.23%) ⬇️
modules/git/repo.go 46.19% <0.00%> (-0.51%) ⬇️
services/pull/pull.go 41.27% <0.00%> (+0.49%) ⬆️
modules/process/manager.go 75.00% <0.00%> (+2.50%) ⬆️

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 f0fe568...663ed08. Read the comment docs.

@lafriks lafriks merged commit 16120c0 into go-gitea:master Oct 21, 2020
@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. modifies/translation skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants