aboutsummaryrefslogtreecommitdiff
path: root/etc/default_settings.py
diff options
context:
space:
mode:
authorzsloan2020-04-26 11:01:05 -0500
committerzsloan2020-04-26 11:01:05 -0500
commit15d8e24da26cf6d42d1bdb8a9a189b9ec061d147 (patch)
treea6a79b8dadbbf2d5568a2bbd137eaeb53f266f20 /etc/default_settings.py
parente4a2db698b1103e7f6ed5c6e59946e343d3820f8 (diff)
parent8f8d383c498dbd9e0d43d43144cdae9a045431ab (diff)
downloadgenenetwork2-15d8e24da26cf6d42d1bdb8a9a189b9ec061d147.tar.gz
Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testing
Diffstat (limited to 'etc/default_settings.py')
-rw-r--r--etc/default_settings.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/etc/default_settings.py b/etc/default_settings.py
index e01e4439..55f06a68 100644
--- a/etc/default_settings.py
+++ b/etc/default_settings.py
@@ -28,7 +28,8 @@ GN_VERSION = open("../etc/VERSION","r").read()
SQL_URI = "mysql://gn2:mysql_password@localhost/db_webqtl_s"
SQL_ALCHEMY_POOL_RECYCLE = 3600
GN_SERVER_URL = "http://localhost:8880/" # REST API server
-GN2_BASE_URL = "http://genenetwork.org/" # Main GN2 URL
+GN2_BASE_URL = "http://genenetwork.org/"
+GN2_BRANCH_URL = GN2_BASE_URL
# ---- Flask configuration (see website)
TRAP_BAD_REQUEST_ERRORS = True