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.

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

Update docs and comments to remove macaron #14491

Merged
merged 4 commits into from
Jan 29, 2021
Merged

Update docs and comments to remove macaron #14491

merged 4 commits into from
Jan 29, 2021

Conversation

lunny
Copy link
Member

@lunny lunny commented Jan 27, 2021

As title.

@lunny lunny added the type/docs This PR mainly updates/creates documentation label Jan 27, 2021
@6543
Copy link
Member

6543 commented Jan 27, 2021 

modules/setting/session.go
22:		// Cookie name to save session ID. Default is "MacaronSession".

modules/context/context.go
261:// Currently to be compatible with macaron, we keep it.

modules/cache/cache_redis.go
117:// AdapterConfig: network=tcp,addr=:6379,password=macaron,db=0,pool_size=100,idle_timeout=180,hset_name=MacaronCache,prefix=cache:
119:	c.hsetName = "MacaronCache"

docs/content/doc/advanced/logging-documentation.en-us.md
183:  name. Thus `[log.console.macaron]` will default to `MODE = console`.

docs/content/doc/advanced/config-cheat-sheet.en-us.md
614:NB: You must `REDIRECT_MACARON_LOG` and have `DISABLE_ROUTER_LOG` set to `false` for this option to take effect. Configure each mode in per mode log subsections `\[log.modename.router\]`.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jan 27, 2021
@lunny lunny force-pushed the lunny/update_docs_remove_macaron branch from c328dfc to 0ee164b Compare January 28, 2021 01:58
@lunny
Copy link
Member Author

lunny commented Jan 28, 2021

docs/content/doc/advanced/logging-documentation.en-us.md

Fixed 4 and 5, but 1,2,3 are examples so I haven't change them.

@6543 6543 added this to the 1.14.0 milestone Jan 28, 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 Jan 28, 2021
@codecov-io
Copy link

codecov-io commented Jan 28, 2021 •
edited
Loading

Codecov Report

Merging #14491 (8af99fd) into master (f761c82) will increase coverage by 0.01%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #14491      +/-   ##
==========================================
+ Coverage   42.15%   42.16%   +0.01%     
==========================================
  Files         761      761              
  Lines       81272    81268       -4     
==========================================
+ Hits        34257    34267      +10     
+ Misses      41426    41413      -13     
+ Partials     5589     5588       -1
Impacted Files Coverage Δ
modules/context/api.go 73.29% <ø> (ø)
modules/context/org.go 37.73% <ø> (ø)
modules/context/permission.go 26.78% <ø> (ø)
modules/context/private.go 100.00% <ø> (ø)
modules/context/repo.go 54.93% <ø> (ø)
modules/log/log.go 61.02% <ø> (ø)
modules/public/dynamic.go 50.00% <ø> (ø)
modules/public/public.go 54.79% <ø> (ø)
modules/setting/setting.go 48.93% <ø> (-0.10%) ⬇️
modules/translation/translation.go 82.35% <ø> (ø)
... and 10 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 f761c82...8af99fd. Read the comment docs.

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

6543 commented Jan 29, 2021

🚀

@6543 6543 merged commit 0cd87d6 into go-gitea:master Jan 29, 2021
@lunny lunny deleted the lunny/update_docs_remove_macaron branch January 29, 2021 16:24
a1012112796 added a commit to a1012112796/gitea that referenced this pull request Feb 3, 2021
@a1012112796
Merge branch 'master' into feature/dismissing_reviews
d017a10 
* master: (28 commits)
  [Docs] Clone filters (go-gitea#14555)
  update docs to show latest stable version (1.13.2) (go-gitea#14550)
  Adding Chi's GetHead middleware (go-gitea#14541)
  Changelog v1.13.2 (go-gitea#14535) (go-gitea#14543)
  [skip ci] Updated translations via Crowdin
  [API] List, Check, Add & delete endpoints for repository teams (go-gitea#13630)
  [skip ci] Updated translations via Crowdin
  rm redirect (go-gitea#14534)
  Upgrade 'css-minimizer-webpack-plugin' to the latest version (go-gitea#14527)
  Set the name Mapper in migrations (go-gitea#14526)
  Internal ssh server respect Ciphers, MACs and KeyExchanges settings (go-gitea#14523)
  Move middlewares to web/middleware (go-gitea#14480)
  Add Doctor FixWrongUserType (go-gitea#14522)
  [skip ci] Updated translations via Crowdin
  noop (go-gitea#14521)
  Update docs and comments to remove macaron (go-gitea#14491)
  [skip ci] Updated translations via Crowdin
  Fix json charset bug (go-gitea#14514)
  enhancement: add signoff option in commit form (go-gitea#14516)
  Fix load time bug (go-gitea#14508)
  ...
@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

@6543 6543 6543 approved these changes

@a1012112796 a1012112796 a1012112796 approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/docs This PR mainly updates/creates documentation
Projects
None yet
Milestone
1.14.0
Development

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