code merge error #8183
Merged
code merge error #8183
Conversation
This file contains 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
dosubot
bot
added
size:S
12 tasks
crazywoola
previously approved these changes
Sep 10, 2024
crazywoola
approved these changes
Sep 10, 2024
Scorpion1221
added a commit
to yybht155/dify
that referenced
this pull request
Sep 10, 2024
* commit 'dabfd74622a613c7198f06791ad70424ac94f54f': (222 commits) feat: Parallel Execution of Nodes in Workflows (langgenius#8192) docs: replace docker-compose with docker compose (langgenius#8195) refactor(api/core): Improve type hints and apply ruff formatter in agent runner and model manager. (langgenius#8166) filter excel empty sheet (langgenius#8194) fix: The length of the tag should between 1 and 50 (langgenius#8187) (langgenius#8188) nvidia rerank top n missed (langgenius#8185) fix: Version '2.6.2-2' for 'expat' was not found (langgenius#8182) code merge error (langgenius#8183) add volcengine tos storage (langgenius#8164) chore: bump super-linter to v7 (langgenius#8148) feat(api/core/model_runtime/entities/defaults.py): Add TOP_K in default parameters. (langgenius#8167) Fix variable typo (cont) (langgenius#8161) update qwen-long (langgenius#8157) Update LICENSE - remove 'SaaS' from restriction term definition (langgenius#8143) fix: html raw render (langgenius#8138) chore: translate i18n files (langgenius#8135) fix: user-select style and pre-create iframe in embed.js (langgenius#8093) Modify model parameters in Spark LLMs and zhipuai LLMs (langgenius#8078) chore: offline n to 1 retrieval (langgenius#8134) fix: ollama text embedding 500 error (langgenius#8131) ... # Conflicts: # api/configs/app_config.py # api/configs/feature/__init__.py # api/core/helper/code_executor/code_executor.py # api/services/conversation_service.py # web/yarn.lock
5 tasks
cuiks
pushed a commit
to cuiks/dify
that referenced
this pull request
Sep 26, 2024
Co-authored-by: crazywoola <427733928@qq.com>
lau-td
pushed a commit
to heydevs-io/dify
that referenced
this pull request
Oct 23, 2024
Co-authored-by: crazywoola <427733928@qq.com>
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.
Checklist:
Important
Please review the checklist below before submitting your pull request.
dev/reformat(backend) andcd web && npx lint-staged(frontend) to appease the lint godsDescription
code merge error
Fixes #8175
Type of Change
Testing Instructions
Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration