Skip to content

Move macaron to chi #14293

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 83 commits into from
Jan 26, 2021
Merged

Move macaron to chi #14293

merged 83 commits into from
Jan 26, 2021

Conversation

lunny
Copy link
Member

@lunny lunny commented Jan 10, 2021 •
edited
Loading

Use chi instead of the forked macaron. Since macaron and chi have conflicts with session share, this big PR becomes a have-to thing. According my previous idea, we can replace macaron step by step but I'm wrong. :( Below is a list of big changes on this PR.

Notices:

  • Chi router don't support request with trailing slash
  • Integration test TestUserHeatmap maybe mysql version related. It's failed on my macOS(mysql 5.7.29 installed via brew) but succeed on CI.

UPDATE: 2020.01.27

  • environment variables HOST, PORT and MACARON_ENV has been removed. BREAK

@lunny lunny added this to the 1.14.0 milestone Jan 12, 2021
@lunny lunny added the type/refactoring Existing code has been cleaned up. There should be no new functionality. label Jan 12, 2021
@techknowlogick techknowlogick added the pr/wip This PR is not ready for review label Jan 12, 2021
@lunny lunny mentioned this pull request Jan 12, 2021
Closed
@lunny lunny mentioned this pull request Jan 13, 2021
Closed
@lunny lunny force-pushed the lunny/routes2 branch 2 times, most recently from 8ecdfb9 to 07ce068 Compare January 14, 2021 02:58
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jan 14, 2021
@lunny lunny force-pushed the lunny/routes2 branch 7 times, most recently from 426ec54 to 673b3d4 Compare January 18, 2021 04:54
@lunny lunny added the pr/breaking Merging this PR means builds will break. Needs a description what exactly breaks, and how to fix it! label Jan 18, 2021
@lunny lunny force-pushed the lunny/routes2 branch 11 times, most recently from 253c02a to e72c4c2 Compare January 24, 2021 09:00
@codecov-io
Copy link

codecov-io commented Jan 24, 2021 •
edited
Loading

Codecov Report

Merging #14293 (89d62de) into master (bc05ddc) will increase coverage by 0.30%.
The diff coverage is 57.67%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #14293      +/-   ##
==========================================
+ Coverage   41.74%   42.05%   +0.30%     
==========================================
  Files         751      758       +7     
  Lines       80193    81014     +821     
==========================================
+ Hits        33479    34068     +589     
- Misses      41183    41391     +208     
- Partials     5531     5555      +24
Impacted Files Coverage Δ
cmd/dump.go 0.88% <ø> (ø)
cmd/web.go 0.00% <0.00%> (ø)
cmd/web_letsencrypt.go 0.00% <0.00%> (ø)
modules/cache/cache_redis.go 3.17% <ø> (ø)
modules/context/secret.go 0.00% <0.00%> (ø)
modules/forms/org.go 0.00% <0.00%> (ø)
modules/forms/user_form_auth_openid.go 0.00% <0.00%> (ø)
modules/session/redis.go 2.15% <ø> (ø)
modules/session/virtual.go 61.45% <ø> (+1.25%) ⬆️
modules/setting/log.go 57.53% <ø> (-1.50%) ⬇️
... and 151 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 efe4235...89d62de. Read the comment docs.

6543
6543 reviewed Jan 24, 2021
View reviewed changes
6543
6543 reviewed Jan 24, 2021
View reviewed changes
@6543 6543 mentioned this pull request Jan 24, 2021
Closed
a1012112796
a1012112796 reviewed Jan 25, 2021
View reviewed changes
a1012112796
a1012112796 reviewed Jan 25, 2021
View reviewed changes
@lunny
Copy link
Member Author

lunny commented Jan 25, 2021

@6543 @a1012112796 All done.

@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 Jan 25, 2021
@6543
Copy link
Member

6543 commented Jan 25, 2021

I think we should refactor some things and have a second look at all the context things - but this pull is big enough ... and works fine :)

@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 Jan 26, 2021
@6543
Copy link
Member

6543 commented Jan 26, 2021

.

@6543 6543 merged commit 6433ba0 into go-gitea:master Jan 26, 2021
@lunny lunny deleted the lunny/routes2 branch January 26, 2021 15:38
a1012112796 added a commit to a1012112796/gitea that referenced this pull request Jan 27, 2021
@a1012112796
Merge branch 'master' into feature/dismissing_reviews
8f5873d 
* master:
  [skip ci] Updated translations via Crowdin
  Fix bug because of duplicated join (go-gitea#14454)
  Cron job to cleanup hook_task table (go-gitea#13080)
  Fix panic 500 page rendering (go-gitea#14474)
  [skip ci] Updated translations via Crowdin
  Move macaron to chi (go-gitea#14293)
  [skip ci] Updated translations via Crowdin
  Fix incorrect key name so registerManualConfirm setting works as expected. (go-gitea#14455)
a1012112796 added a commit to a1012112796/gitea that referenced this pull request Jan 27, 2021
@a1012112796
Merge branch 'master' into ui_create_tag
8252fa5 
* master:
  [skip ci] Updated translations via Crowdin
  Fix bug because of duplicated join (go-gitea#14454)
  Cron job to cleanup hook_task table (go-gitea#13080)
  Fix panic 500 page rendering (go-gitea#14474)
  [skip ci] Updated translations via Crowdin
  Move macaron to chi (go-gitea#14293)
  [skip ci] Updated translations via Crowdin
  Fix incorrect key name so registerManualConfirm setting works as expected. (go-gitea#14455)
a1012112796 added a commit to a1012112796/gitea that referenced this pull request Jan 27, 2021
@a1012112796
Merge branch 'master' into empty_pr
14f7d33 
* master:
  [skip ci] Updated translations via Crowdin
  Fix bug because of duplicated join (go-gitea#14454)
  Cron job to cleanup hook_task table (go-gitea#13080)
  Fix panic 500 page rendering (go-gitea#14474)
  [skip ci] Updated translations via Crowdin
  Move macaron to chi (go-gitea#14293)
@go-gitea go-gitea locked and limited conversation to collaborators Mar 11, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lafriks lafriks lafriks approved these changes

@6543 6543 6543 approved these changes

+1 more reviewer

@a1012112796 a1012112796 a1012112796 left review comments

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. pr/breaking Merging this PR means builds will break. Needs a description what exactly breaks, and how to fix it! type/refactoring Existing code has been cleaned up. There should be no new functionality.
Projects
None yet
Milestone
1.14.0
Development

Successfully merging this pull request may close these issues.
7 participants
@lunny @codecov-io @6543 @lafriks @a1012112796 @techknowlogick @GiteaBot