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

Unify migration descriptions #16781

Merged
merged 5 commits into from
Aug 25, 2021
Merged

Conversation

delvh
Copy link
Member

@delvh delvh commented Aug 23, 2021

All migration descriptions now follow a unified naming approach.
Additionally, a Gitea migration now no longer asks whether to migrate Merge requests, but Pull Requests instead.
Fixes #16777.
Fixes #16782.

EDIT: I have just noticed that
Migrate data from <Provider.URL> or another <Provider> instance. can be used as well instead of
Migrate data from <Provider.URL> or other <Provider> instances.
Which one is preferred?

New appearance

image

Previous appearance

image

@codecov-commenter
Copy link

codecov-commenter commented Aug 23, 2021

Codecov Report

Merging #16781 (e3f79f9) into main (e891d68) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@           Coverage Diff           @@
##             main   #16781   +/-   ##
=======================================
  Coverage   45.48%   45.49%           
=======================================
  Files         762      762           
  Lines       85975    85969    -6     
=======================================
+ Hits        39106    39111    +5     
+ Misses      40555    40548    -7     
+ Partials     6314     6310    -4     
Impacted Files Coverage Δ
models/index.go 49.05% <ø> (ø)
models/user.go 54.55% <100.00%> (+0.14%) ⬆️
modules/util/timer.go 42.85% <0.00%> (-42.86%) ⬇️
models/repo_list.go 77.64% <0.00%> (-0.79%) ⬇️
routers/api/v1/repo/pull.go 29.63% <0.00%> (+0.51%) ⬆️
modules/queue/workerpool.go 53.81% <0.00%> (+0.76%) ⬆️
modules/log/file.go 75.20% <0.00%> (+1.60%) ⬆️
modules/queue/manager.go 68.18% <0.00%> (+2.84%) ⬆️

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 b88dbe1...e3f79f9. Read the comment docs.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Aug 23, 2021
@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 Aug 23, 2021
@noerw noerw added modifies/translation skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. labels Aug 23, 2021
@noerw noerw added this to the 1.16.0 milestone Aug 23, 2021
@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 Aug 25, 2021
@delvh
Copy link
Member Author

delvh commented Aug 25, 2021

EDIT: I have just noticed that
Migrate data from <Provider.URL> or another <Provider> instance. can be used as well instead of
Migrate data from <Provider.URL> or other <Provider> instances.
Which one is preferred?

This question hasn't been answered yet.

@lunny lunny merged commit 20efc6b into go-gitea:main Aug 25, 2021
@lunny
Copy link
Member

lunny commented Aug 25, 2021

EDIT: I have just noticed that
Migrate data from <Provider.URL> or another <Provider> instance. can be used as well instead of
Migrate data from <Provider.URL> or other <Provider> instances.
Which one is preferred?

This question hasn't been answered yet.

Hm, for me. Both OK.

@KN4CK3R
Copy link
Member

KN4CK3R commented Aug 25, 2021

I vote for 1.

@delvh delvh deleted the unify-migration-strings branch August 25, 2021 16:53
@go-gitea go-gitea locked and limited conversation to collaborators Oct 19, 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. modifies/translation skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Gitea migration should migrate Pull Requests, not Merge Requests Unify migration descriptions
7 participants