Skip to content

Commit

Permalink
Merge branch 'release_17.09' into release_18.01
Browse files Browse the repository at this point in the history
  • Loading branch information
nsoranzo committed Feb 16, 2018
2 parents 5488cf2 + 13e72e8 commit 0d029b3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
3 changes: 3 additions & 0 deletions config/reports.yml.sample
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ uwsgi:

offload-threads: 8

static-map: /static/style=static/style/blue
static-map: /static=static

module: galaxy.webapps.reports.buildapp:uwsgi_app()

reports:
Expand Down
3 changes: 3 additions & 0 deletions config/tool_shed.yml.sample
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ uwsgi:

offload-threads: 8

static-map: /static/style=static/style/blue
static-map: /static=static

module: galaxy.webapps.tool_shed.buildapp:uwsgi_app()

tool_shed:
Expand Down

0 comments on commit 0d029b3

Please sign in to comment.