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
knowledge-platform
Commits
543c794c
Unverified
Commit
543c794c
authored
4 years ago
by
Mahesh Kumar Gangula
Committed by
GitHub
4 years ago
Browse files
Options
Download
Plain Diff
Merge branch 'release-3.1.0' into temp-merge-release-3.0.0
parents
2fec5b2a
22aa1c44
Changes
73
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
.circleci/config.yml
+4
-1
.circleci/config.yml
assessment-api/assessment-actors/pom.xml
+17
-11
assessment-api/assessment-actors/pom.xml
assessment-api/assessment-service/app/controllers/BaseController.scala
+6
-5
...i/assessment-service/app/controllers/BaseController.scala
assessment-api/assessment-service/app/controllers/v3/ItemSetController.scala
+5
-5
...ssment-service/app/controllers/v3/ItemSetController.scala
assessment-api/assessment-service/pom.xml
+3
-5
assessment-api/assessment-service/pom.xml
assessment-api/pom.xml
+4
-9
assessment-api/pom.xml
build/assessment-service/Dockerfile
+1
-1
build/assessment-service/Dockerfile
build/assessment-service/Jenkinsfile
+1
-1
build/assessment-service/Jenkinsfile
build/assessment-service/auto_build_deploy
+1
-1
build/assessment-service/auto_build_deploy
build/content-service/Dockerfile
+1
-1
build/content-service/Dockerfile
build/content-service/Jenkinsfile
+1
-1
build/content-service/Jenkinsfile
build/content-service/auto_build_deploy
+1
-1
build/content-service/auto_build_deploy
build/search-service/Dockerfile
+1
-1
build/search-service/Dockerfile
build/search-service/Jenkinsfile
+1
-1
build/search-service/Jenkinsfile
build/search-service/auto_build_deploy
+1
-1
build/search-service/auto_build_deploy
build/taxonomy-service/Dockerfile
+1
-1
build/taxonomy-service/Dockerfile
build/taxonomy-service/Jenkinsfile
+1
-1
build/taxonomy-service/Jenkinsfile
content-api/content-actors/pom.xml
+18
-17
content-api/content-actors/pom.xml
content-api/content-actors/src/test/resources/application.conf
+2
-2
...nt-api/content-actors/src/test/resources/application.conf
content-api/content-actors/src/test/scala/org/sunbird/content/util/CopyManagerTest.scala
+1
-4
...test/scala/org/sunbird/content/util/CopyManagerTest.scala
with
71 additions
and
70 deletions
+71
-70
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