Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: publications rules #269

Merged
merged 23 commits into from
Mar 14, 2024
Merged

feat: publications rules #269

merged 23 commits into from
Mar 14, 2024

Conversation

artsiomkorzun
Copy link
Collaborator

No description provided.

# Conflicts:
#	src/main/java/com/epam/aidial/core/AiDial.java
#	src/main/java/com/epam/aidial/core/Proxy.java
#	src/main/java/com/epam/aidial/core/controller/AccessControlBaseController.java
#	src/main/java/com/epam/aidial/core/storage/BlobStorage.java
# Conflicts:
#	src/main/java/com/epam/aidial/core/AiDial.java
#	src/main/java/com/epam/aidial/core/Proxy.java
#	src/main/java/com/epam/aidial/core/storage/ResourceDescription.java
#	src/main/java/com/epam/aidial/core/util/ProxyUtil.java
# Conflicts:
#	src/main/java/com/epam/aidial/core/storage/ResourceDescription.java
…ules

# Conflicts:
#	src/main/java/com/epam/aidial/core/AiDial.java
#	src/main/java/com/epam/aidial/core/controller/AccessControlBaseController.java
#	src/main/java/com/epam/aidial/core/controller/ControllerSelector.java
#	src/main/java/com/epam/aidial/core/controller/PublicationController.java
#	src/main/java/com/epam/aidial/core/data/Publication.java
#	src/main/java/com/epam/aidial/core/data/ResourceType.java
#	src/main/java/com/epam/aidial/core/security/AccessService.java
#	src/main/java/com/epam/aidial/core/service/PublicationService.java
#	src/test/java/com/epam/aidial/core/PublicationApiTest.java
#	src/test/java/com/epam/aidial/core/ResourceBaseTest.java
#	src/test/java/com/epam/aidial/core/storage/ResourceDescriptionTest.java
…ules

# Conflicts:
#	src/main/java/com/epam/aidial/core/controller/AccessControlBaseController.java
#	src/main/java/com/epam/aidial/core/controller/DeploymentPostController.java
#	src/main/java/com/epam/aidial/core/security/AccessService.java
@artsiomkorzun artsiomkorzun merged commit 69518ca into development Mar 14, 2024
7 checks passed
@astsiapanay astsiapanay deleted the publications-rules branch August 9, 2024 15:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants