diff options
| author | zsloan | 2020-04-26 11:01:05 -0500 |
|---|---|---|
| committer | zsloan | 2020-04-26 11:01:05 -0500 |
| commit | 15d8e24da26cf6d42d1bdb8a9a189b9ec061d147 (patch) | |
| tree | a6a79b8dadbbf2d5568a2bbd137eaeb53f266f20 /etc | |
| parent | e4a2db698b1103e7f6ed5c6e59946e343d3820f8 (diff) | |
| parent | 8f8d383c498dbd9e0d43d43144cdae9a045431ab (diff) | |
| download | genenetwork2-15d8e24da26cf6d42d1bdb8a9a189b9ec061d147.tar.gz | |
Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testing
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/default_settings.py | 3 |
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 |