Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
UPSMF
sunbird-lms-service
Commits
60dcb76b
Unverified
Commit
60dcb76b
authored
3 years ago
by
Hari-stackroute
Committed by
GitHub
3 years ago
Browse files
Options
Download
Patches
Plain Diff
Merging Release 4.7.0 to master branch (#1062)
parent
1eafb35e
release-5.1.0-student-login-endpoint
dependabot/maven/controller/com.fasterxml.jackson.core-jackson-databind-2.12.7.1
dependabot/maven/core/actor-core/com.fasterxml.jackson.core-jackson-databind-2.12.7.1
dependabot/maven/core/cassandra-utils/com.fasterxml.jackson.core-jackson-databind-2.12.7.1
dependabot/maven/core/notification-utils/com.fasterxml.jackson.core-jackson-databind-2.12.7.1
dependabot/maven/core/platform-common/com.fasterxml.jackson.core-jackson-databind-2.12.7.1
dependabot/maven/core/platform-common/org.apache.kafka-kafka-clients-0.10.2.2
dependabot/maven/core/platform-common/org.jboss.resteasy-resteasy-client-3.14.0.Final
helmchart
master
patch-1
patch-2
release-4.10.0
release-4.10.1
release-4.9.0
release-5.0.0
release-5.0.1
release-5.0.2
release-5.1.0
release-5.0.1_RC1
release-5.0.0_RC5
release-5.0.0_RC4
release-5.0.0_RC3
release-5.0.0_RC2
release-5.0.0_RC1
release-4.10.1_RC1
release-4.10.0_RC5
release-4.10.0_RC4
release-4.10.0_RC3
release-4.10.0_RC2
release-4.10.0_RC1
release-4.9.0_RC3
release-4.9.0_RC2
release-4.9.0_RC1
No related merge requests found
Changes
29
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
.circleci/config.yml
+1
-1
.circleci/config.yml
controller/app/controllers/BaseController.java
+32
-10
controller/app/controllers/BaseController.java
controller/app/modules/OnRequestHandler.java
+12
-5
controller/app/modules/OnRequestHandler.java
controller/app/util/PrintEntryExitLog.java
+1
-4
controller/app/util/PrintEntryExitLog.java
controller/app/util/RequestInterceptor.java
+2
-0
controller/app/util/RequestInterceptor.java
controller/conf/routes
+2
-0
controller/conf/routes
core/platform-common/src/main/java/org/sunbird/exception/ResponseCode.java
+0
-11
...mon/src/main/java/org/sunbird/exception/ResponseCode.java
core/platform-common/src/main/java/org/sunbird/exception/ResponseMessage.java
+33
-43
.../src/main/java/org/sunbird/exception/ResponseMessage.java
core/platform-common/src/main/java/org/sunbird/keys/JsonKey.java
+2
-1
...atform-common/src/main/java/org/sunbird/keys/JsonKey.java
core/platform-common/src/test/java/org/sunbird/validator/OrgValidatorTest.java
+1
-1
...src/test/java/org/sunbird/validator/OrgValidatorTest.java
service/src/main/java/org/sunbird/actor/user/ManagedUserActor.java
+3
-0
...rc/main/java/org/sunbird/actor/user/ManagedUserActor.java
service/src/main/java/org/sunbird/actor/user/UserExternalIdManagementActor.java
+4
-3
...org/sunbird/actor/user/UserExternalIdManagementActor.java
service/src/main/java/org/sunbird/actor/user/UserMergeActor.java
+5
-4
.../src/main/java/org/sunbird/actor/user/UserMergeActor.java
service/src/main/java/org/sunbird/actor/user/UserProfileReadActor.java
+2
-3
...ain/java/org/sunbird/actor/user/UserProfileReadActor.java
service/src/main/java/org/sunbird/actor/user/UserUpdateActor.java
+2
-2
...src/main/java/org/sunbird/actor/user/UserUpdateActor.java
service/src/main/java/org/sunbird/actor/user/validator/UserRequestValidator.java
+12
-6
...rg/sunbird/actor/user/validator/UserRequestValidator.java
service/src/main/java/org/sunbird/service/tenantpreference/TenantPreferenceService.java
+11
-9
...ird/service/tenantpreference/TenantPreferenceService.java
service/src/main/java/org/sunbird/service/user/UserProfileReadService.java
+6
-4
...java/org/sunbird/service/user/UserProfileReadService.java
service/src/main/java/org/sunbird/service/user/impl/UserExternalIdentityServiceImpl.java
+8
-0
...rd/service/user/impl/UserExternalIdentityServiceImpl.java
service/src/main/java/org/sunbird/service/user/impl/UserLookUpServiceImpl.java
+3
-3
.../org/sunbird/service/user/impl/UserLookUpServiceImpl.java
with
142 additions
and
110 deletions
+142
-110
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets
