diff options
| author | James Edwards-Jones <jamedjo@gmail.com> | 2017-02-06 15:12:27 +0000 |
|---|---|---|
| committer | James Edwards-Jones <jamedjo@gmail.com> | 2017-02-06 15:12:27 +0000 |
| commit | b988faaf85c8e68d501f242b980e5e79a00e2b15 (patch) | |
| tree | faffbfe623bfcbfe1c09bddac00b2cc879baff63 /config/gitlab.yml.example | |
| parent | 5af4cae544c8526de63e639bd6c7db730526add3 (diff) | |
| parent | 53db7d1d75e1d14cb20278bd0c1a75ce24a6626d (diff) | |
| download | gitlab-ce-b988faaf85c8e68d501f242b980e5e79a00e2b15.tar.gz | |
Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ce
# Conflicts:
# db/schema.rb
Diffstat (limited to 'config/gitlab.yml.example')
| -rw-r--r-- | config/gitlab.yml.example | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 1cf24e3f3db..cc1af77a1de 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -520,6 +520,16 @@ production: &base # Git timeout to read a commit, in seconds timeout: 10 + ## Webpack settings + # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running + # on a given port instead of serving directly from /assets/webpack. This is only indended for use + # in development. + webpack: + # dev_server: + # enabled: true + # host: localhost + # port: 3808 + # # 5. Extra customization # ========================== |