macaron/i18n
Archived
1
1
Fork 2
Code Issues Pull Requests Releases Wiki Activity

update-i18n-with-changes-from-upstream #4

Merged
techknowlogick merged 20 commits from zeripath/i18n:update-i18n-with-changes-from-upstream into master 2020-09-10 17:19:41 +00:00
Conversation 4 Commits 20 Files Changed 5 +166 -110
zeripath commented 2020-09-09 19:44:57 +00:00
Contributor
Copy Link

Relink histories from upstream

Relink histories from upstream
zeripath added 19 commits 2020-09-09 19:45:00 +00:00
ci: migrate from Travis to GitHub Actions (#7) 
* ci: migrate from Travis to GitHub Actions

* Fix lint error and failing tests

Co-authored-by: Sourcegraph Bot <campaigns@sourcegraph.com>
5a5348d12f
codecov: set comment style (#8) 
Co-authored-by: Sourcegraph Bot <campaigns@sourcegraph.com>
fd88c6b79c
codecov: formalize coverage settings (#9) 
Co-authored-by: Sourcegraph Bot <campaigns@sourcegraph.com>
323cb3701f
apply partial from 5a5348d12f 
Signed-off-by: Andrew Thornton <art27@cantab.net>
9233b00089
apply partial from d63b93da59 
Signed-off-by: Andrew Thornton <art27@cantab.net>
13269e3962
Join histories of github.com/go-macaron/i18n at this point 
All of the codecov/travis/actions changes are ignored.
All checks were successful
continuous-integration/drone/pr Build is passing
Details
befa976b83
techknowlogick approved these changes 2020-09-09 20:22:31 +00:00
Dismissed
lafriks approved these changes 2020-09-10 10:17:55 +00:00
Dismissed
lafriks commented 2020-09-10 10:18:11 +00:00
First-time contributor
Copy Link

Please resove conflicts

Please resove conflicts
6543 commented 2020-09-10 12:33:50 +00:00
First-time contributor
Copy Link

pleace resolve conflict

pleace resolve conflict
zeripath added 1 commit 2020-09-10 16:26:35 +00:00
Merge remote-tracking branch 'gitea/master' into update-i18n-with-changes-from-upstream
All checks were successful
continuous-integration/drone/pr Build is passing
Details
4fe2f2f0fe
zeripath commented 2020-09-10 16:33:46 +00:00
Author
Contributor
Copy Link

In this particular case it could be better to merge this in rather than squash merge as it can provide a merge base for future changes to upstream.

Another option would be make a branch from this pull head and call it upstream-merge base?

In this particular case it could be better to merge this in rather than squash merge as it can provide a merge base for future changes to upstream. Another option would be make a branch from this pull head and call it upstream-merge base?
techknowlogick merged commit 7bbf54aa4c into master 2020-09-10 17:19:41 +00:00
techknowlogick commented 2020-09-10 17:20:46 +00:00
Contributor
Copy Link

Merged using merge strategy.

Merged using merge strategy.
zeripath deleted branch update-i18n-with-changes-from-upstream 2020-09-10 17:33:30 +00:00
This repo is archived. You cannot comment on pull requests.
Reviewers
No reviewers
Labels
Clear labels   
in

   
kind/breaking

   
kind/bug

   
kind/deployment

   
kind/docs

   
kind/enhancement

   
kind/feature

   
kind/lint

   
kind/proposal

   
kind/question

   
kind/security

   
kind/testing

   
kind/translation

   
kind/ui

   
lgtm/done

   
lgtm/need

   
lgtm/need

   
priority/critical

   
priority/low

   
priority/maybe

   
priority/medium

   
refactor

   
reviewed/duplicate

   
reviewed/invalid

   
reviewed/wontfix

   
status/blocked

   
status/needs-feedback

   
status/wip
No Label
in
kind/breaking
kind/bug
kind/deployment
kind/docs
kind/enhancement
kind/feature
kind/lint
kind/proposal
kind/question
kind/security
kind/testing
kind/translation
kind/ui
lgtm/done
lgtm/need
lgtm/need
priority/critical
priority/low
priority/maybe
priority/medium
refactor
reviewed/duplicate
reviewed/invalid
reviewed/wontfix
status/blocked
status/needs-feedback
status/wip
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
4 Participants
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: macaron/i18n#4
No description provided.
Delete Branch "zeripath/i18n:update-i18n-with-changes-from-upstream"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?