Merge branch 'dev' into feature/milestone-pausing

# Conflicts:
#	config/default.json
#	postman.json

Author: maxceem

config/custom-environment-variables.json

@@ -22,8 +22,6 @@
   "fileServiceEndpoint": "FILE_SERVICE_ENDPOINT",
   "identityServiceEndpoint": "IDENTITY_SERVICE_ENDPOINT",
   "memberServiceEndpoint": "MEMBER_SERVICE_ENDPOINT",
-  "systemUserClientId": "SYSTEM_USER_CLIENT_ID",
-  "systemUserClientSecret": "SYSTEM_USER_CLIENT_SECRET",
   "connectProjectsUrl": "CONNECT_PROJECTS_URL",
   "dbConfig": {
     "masterUrl": "DB_MASTER_URL",

config/default.json

@@ -25,8 +25,6 @@
     "timelineIndexName": "timelines",
     "timelineDocType": "timelineV4"
   },
-  "systemUserClientId": "",
-  "systemUserClientSecret": "",
   "connectProjectUrl":"",
   "dbConfig": {
     "masterUrl": "",
@@ -60,5 +58,6 @@
   "connectUrl":"https://connect.topcoder-dev.com",
   "accountsAppUrl": "https://accounts.topcoder-dev.com",
   "MAX_REVISION_NUMBER": 100,
+  "UNIQUE_GMAIL_VALIDATION": true,
   "VALID_STATUSES_BEFORE_PAUSED": "[\"active\"]"
 }

migrations/20190526_project_estimation.sql

@@ -0,0 +1,35 @@
+--
+-- CREATE NEW TABLE:
+--   project_estimations
+--
+
+CREATE TABLE project_estimations
+(
+    id bigint NOT NULL,
+    "buildingBlockKey" character varying(255) NOT NULL,
+    conditions character varying(512) NOT NULL,
+    price double precision NOT NULL,
+    "minTime" integer NOT NULL,
+    "maxTime" integer NOT NULL,
+    metadata json NOT NULL DEFAULT '{}'::json,
+    "projectId" bigint NOT NULL,
+    "deletedAt" timestamp with time zone,
+    "createdAt" timestamp with time zone,
+    "updatedAt" timestamp with time zone,
+    "deletedBy" bigint,
+    "createdBy" integer NOT NULL,
+    "updatedBy" integer NOT NULL,
+    CONSTRAINT project_estimations_pkey PRIMARY KEY (id)
+);
+
+CREATE SEQUENCE project_estimations_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+ALTER SEQUENCE project_estimations_id_seq OWNED BY project_estimations.id;
+
+ALTER TABLE project_estimations
+    ALTER COLUMN id SET DEFAULT nextval('project_estimations_id_seq');