Merge pull request #201 from appirio-tech/release

Release with topcoder-app

Author: thabofletcher

Gruntfile.js

@@ -48,9 +48,10 @@ module.exports = function(grunt) {
     communityURL: grunt.option('community-url') || '//community.topcoder.com',
     reviewAppURL: grunt.option('review-app-url') || 'software.topcoder.com/review',
     helpAppURL: grunt.option('help-app-url') || 'help.topcoder.com',
-    forumsAppURL: grunt.option('forums-app-url') || 'forums.topcoder.com',
+    forumsAppURL: grunt.option('forums-app-url') || 'apps.topcoder.com/forums/',
     swiftProgramId: grunt.option('swift-program-id') || 3445,
     swiftProgramURL: grunt.option('swift-program-url') || 'http://ios.topcoder.com',
+    arenaURL: grunt.option('arena-url') || '//arena.topcoder.com',
 
     // only used on wp setup
     useGz: grunt.option('use-gz') || false,

src/conf/debug-local-qa.sh

@@ -1 +1 @@
-grunt --main-url=http://local.topcoder-qa.com --auth-main-url=topcoder-qa.auth0.com --auth-client-id=EVOgWZlCtIFlbehkq02treuRRoJk12UR --auth-callback-url="https://www.topcoder-qa.com/reg2/callback.action" --api-url=https://api.topcoder-qa.com/v2 --lc-url=https://qa-lc1-ext-challenge-service.herokuapp.com --lc-discussion-url=https://qa-lc1-discussion-service.herokuapp.com --lc-user-url=https://qa-lc1-user-service.herokuapp.com --lc-site-url=https://qa-lc1-challenge-app.herokuapp.com --my-filters-url=https://staging-user-settings-service.herokuapp.com --community-url=//community.topcoder-qa.com --blog-rss-feed="https://www.topcoder-qa.com/feed/?post_type=blog" dev
+grunt --main-url=http://local.topcoder-qa.com --auth-main-url=topcoder-qa.auth0.com --auth-client-id=EVOgWZlCtIFlbehkq02treuRRoJk12UR --auth-callback-url="https://www.topcoder-qa.com/reg2/callback.action" --api-url=https://api.topcoder-qa.com/v2 --lc-url=https://qa-lc1-ext-challenge-service.herokuapp.com --lc-discussion-url=https://qa-lc1-discussion-service.herokuapp.com --lc-user-url=https://qa-lc1-user-service.herokuapp.com --lc-site-url=https://qa-lc1-challenge-app.herokuapp.com --my-filters-url=https://staging-user-settings-service.herokuapp.com --community-url=//community.topcoder-qa.com --photo-link-base=https://www.topcoder-qa.com --review-app-url=software.topcoder-qa.com/review --help-app-url=help.topcoder-qa.com --forums-app-url=forums.topcoder-qa.com --swift-program-id=3445 --swift-program-url=http://apple.topcoder-qa.com --blog-rss-feed="https://www.topcoder-qa.com/feed/?post_type=blog" --api3-url=https://api.topcoder-qa.com/v3 --use-cdn=1 --use-min=1

src/conf/tc-nginx.conf

@@ -11,6 +11,7 @@ upstream www {
 server {
     listen  80;
     server_name  local.topcoder.com local.topcoder-dev.com local.topcoder-qa.com;
+    charset UTF-8;
 
     set $app_base /home/vagrant;            ## CHANGE ME root apps folder reference 
     set $root_base $app_base/tc-site;

src/conf/tc-prod-nginx.conf

@@ -7,6 +7,7 @@ server {
 	listen 8080 default_server;
 	listen [::]:80 default_server ipv6only=on;
 	listen [::]:8080 default_server ipv6only=on;
+    charset UTF-8;
 
 	if ($http_x_forwarded_proto != "https") {
         return 301 https://$http_host$request_uri;