Skip to content

Commit

Permalink
Merge branch 'refs/heads/develop' into feature/orgs
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/main/java/com/epam/ta/reportportal/jooq/Indexes.java
#	src/main/java/com/epam/ta/reportportal/jooq/JPublic.java
#	src/main/java/com/epam/ta/reportportal/jooq/Keys.java
#	src/main/java/com/epam/ta/reportportal/jooq/Sequences.java
#	src/main/java/com/epam/ta/reportportal/jooq/Tables.java
  • Loading branch information
grabsefx committed May 6, 2024
2 parents 7832dfe + 1df352c commit fe9a2ae
Show file tree
Hide file tree
Showing 7 changed files with 5 additions and 550 deletions.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
*/
public enum ProjectAttributeEnum {

NOTIFICATIONS_ENABLED("notifications.enabled", String.valueOf(false)),
NOTIFICATIONS_EMAIL_ENABLED("notifications.email.enabled", String.valueOf(false)),
NOTIFICATIONS_ENABLED("notifications.enabled", String.valueOf(true)),
NOTIFICATIONS_EMAIL_ENABLED("notifications.email.enabled", String.valueOf(true)),

INTERRUPT_JOB_TIME(Prefix.JOB + "interruptJobTime",
String.valueOf(Duration.ofDays(1).toSeconds())),
Expand Down

This file was deleted.

178 changes: 0 additions & 178 deletions src/main/java/com/epam/ta/reportportal/jooq/tables/JOnboarding.java

This file was deleted.

Loading

0 comments on commit fe9a2ae

Please sign in to comment.