Skip to content

Commit ccfcc6e

Browse files
authored
Merge branch 'master' into develop
2 parents 3ad202c + 0b058d1 commit ccfcc6e

File tree

4 files changed

+1
-4
lines changed

4 files changed

+1
-4
lines changed

config/default.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"TOKEN_CACHE_TIME": "86000",
5151
"whitelistedOriginsForUserIdAuth": "[\"https:\/\/topcoder-newauth.auth0.com\/\",\"https:\/\/api.topcoder-dev.com\"]",
5252
"EMAIL_INVITE_FROM_NAME": "Topcoder",
53-
"EMAIL_INVITE_FROM_EMAIL": "noreply@connect.topcoder.com",
53+
"EMAIL_INVITE_FROM_EMAIL": "noreply@topcoder.com",
5454
"inviteEmailSubject": "You are invited to Topcoder",
5555
"inviteEmailSectionTitle": "Project Invitation",
5656
"workManagerUrl": "https://challenges.topcoder-dev.com",

src/routes/copilotOpportunity/get.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ module.exports = [
5656
plainOpportunity.copilotRequest ? plainOpportunity.copilotRequest.data : {},
5757
{ copilotRequest: undefined },
5858
);
59-
6059
if (!isAdminOrManager) {
6160
delete formattedOpportunity.projectId;
6261
}

src/routes/copilotOpportunity/list.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ module.exports = [
6666
.then((copilotOpportunities) => {
6767
const formattedOpportunities = copilotOpportunities.map((opportunity) => {
6868
const plainOpportunity = opportunity.get({ plain: true });
69-
7069
const formatted = Object.assign({}, plainOpportunity,
7170
plainOpportunity.copilotRequest ? plainOpportunity.copilotRequest.data : {},
7271
{ copilotRequest: undefined },

src/routes/copilotRequest/list.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ module.exports = [
1818
}
1919

2020
const isAdminOrManager = util.hasRoles(req, [USER_ROLE.CONNECT_ADMIN, USER_ROLE.TOPCODER_ADMIN, USER_ROLE.PROJECT_MANAGER]);
21-
2221
const page = parseInt(req.query.page, 10) || 1;
2322
const pageSize = parseInt(req.query.pageSize, 10) || DEFAULT_PAGE_SIZE;
2423
const offset = (page - 1) * pageSize;

0 commit comments

Comments
 (0)