Merged
Conversation
Contributor
|
find Conflicting files,please solve locally |
# Conflicts: # dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/UsersController.java
Contributor
Author
|
fixed conflict |
Contributor
Author
|
Because The t_ds_user table add "state" column, UT is failed. |
Contributor
|
Please solve ut |
# Conflicts: # dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java
Codecov Report
@@ Coverage Diff @@
## dev #2424 +/- ##
============================================
- Coverage 36.16% 36.16% -0.01%
- Complexity 2472 2473 +1
============================================
Files 431 431
Lines 19879 19893 +14
Branches 2419 2421 +2
============================================
+ Hits 7190 7194 +4
- Misses 12048 12055 +7
- Partials 641 644 +3
Continue to review full report at Codecov.
|
Contributor
Author
|
@lgcareer Please review this PR. |
Contributor
|
frontend+1 |
# Conflicts: # dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue # dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js # dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
|
Kudos, SonarCloud Quality Gate passed!
|
Contributor
Author
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
5 participants
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.
Please see #1923 for details.
Before merge, need to execute sql script.