添加7天免登录以及Ldap认证#12
Open
zhaotao1989 wants to merge 26 commits intoctaoist:cdevfrom
Open
Conversation
gulp-3.9在node-12下运行会出现错误 "ReferenceError: primordials is not defined when running"
# Conflicts: # Gulpfile.js
Owner
|
这个我找时间捋捋并测试吧,一次合并太多了 |
每次刷新页面都需要重新输入密码
使用`main-v2.min.js`合并时在生产环境下,`mermaid`图无法正常生成
ctaoist
reviewed
Oct 17, 2022
| "gulp-inject": "", | ||
| "gulp-sequence": "" | ||
| "gulp-sequence": "", | ||
| "gulp-minify-css": "^1.2.4" |
Author
There was a problem hiding this comment.
是的,之前没注意到,重复添加了。后面在打包的时候发现改过来了同时把依赖的版本号填上了,不然有些最新的依赖不兼容构建命令无法正常运行。
Owner
|
暂时只能 cherry-pick 一些commit进行合并,我很抱歉 |
Author
好的,你挑部分有用的commit合并就行。 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.