Merge remote-tracking branch 'upstream/dev' into dev

db_scripts/test_eligibility.insert.sql

@@ -173,18 +173,6 @@ INSERT INTO project_info (project_id, project_info_type_id, value, create_user,
 	VALUES (1110005, 26, "---", "132456", CURRENT, "132456", CURRENT);
 
 INSERT INTO project_info (project_id, project_info_type_id, value, create_user, create_date, modify_user, modify_date)
-	VALUES (1110001, 6, 3330333, "Not private", CURRENT, "132456", CURRENT);
-INSERT INTO project_info (project_id, project_info_type_id, value, create_user, create_date, modify_user, modify_date)
-	VALUES (1110002, 6, "Old logic - access allowed", "132456", CURRENT, "132456", CURRENT);
-INSERT INTO project_info (project_id, project_info_type_id, value, create_user, create_date, modify_user, modify_date)
-	VALUES (1110003, 6, "Old logic - access denied", "132456", CURRENT, "132456", CURRENT);
-INSERT INTO project_info (project_id, project_info_type_id, value, create_user, create_date, modify_user, modify_date)
-	VALUES (1110004, 6, "New logic - access allowed", "132456", CURRENT, "132456", CURRENT);
-INSERT INTO project_info (project_id, project_info_type_id, value, create_user, create_date, modify_user, modify_date)
-	VALUES (1110005, 6, "New logic - access denied", "132456", CURRENT, "132456", CURRENT);
-
-INSERT INTO project_info (project_id, project_info_type_id, value, create_user, create_date, modify_user, modify_date)
->>>>>>> upstream/dev
 	VALUES (1110001, 79, "---", "132456", CURRENT, "132456", CURRENT);
 INSERT INTO project_info (project_id, project_info_type_id, value, create_user, create_date, modify_user, modify_date)
 	VALUES (1110002, 79, "---", "132456", CURRENT, "132456", CURRENT);

queries/check_is_related_with_challenge

@@ -4,7 +4,7 @@ SELECT
   FROM contest_eligibility ce
   WHERE ce.contest_id = @challengeId@
 ) AS is_private
-, (SELECT 
+, (SELECT
     decode(max(ri.value), null, null, 1)
   FROM resource r
     INNER JOIN resource_info ri ON ri.resource_id = r.resource_id AND ri.resource_info_type_id = 1