diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-07-31 17:24:13 +0100 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-07-31 17:24:13 +0100 |
| commit | 0ac012f0ad14e8a77eedb026a2de12bf59fa5881 (patch) | |
| tree | ac4693a27c1ad2c5d37b5884f4ac316f4d56b0f7 /config | |
| parent | 933cfe1e0c493964052b664c2426a90f845f0042 (diff) | |
| parent | 2519027442a5645cc9467e842172143e3f56c7c3 (diff) | |
| download | gitlab-ce-0ac012f0ad14e8a77eedb026a2de12bf59fa5881.tar.gz | |
Merge remote-tracking branch 'origin/master' into ide
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/1_settings.rb | 2 | ||||
| -rw-r--r-- | config/webpack.config.js | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 02d3161f769..63f4c8c9e0a 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -223,7 +223,7 @@ Settings.gitlab['default_can_create_group'] = true if Settings.gitlab['default_c Settings.gitlab['host'] ||= ENV['GITLAB_HOST'] || 'localhost' Settings.gitlab['ssh_host'] ||= Settings.gitlab.host Settings.gitlab['https'] = false if Settings.gitlab['https'].nil? -Settings.gitlab['port'] ||= Settings.gitlab.https ? 443 : 80 +Settings.gitlab['port'] ||= ENV['GITLAB_PORT'] || (Settings.gitlab.https ? 443 : 80) Settings.gitlab['relative_url_root'] ||= ENV['RAILS_RELATIVE_URL_ROOT'] || '' Settings.gitlab['protocol'] ||= Settings.gitlab.https ? "https" : "http" Settings.gitlab['email_enabled'] ||= true if Settings.gitlab['email_enabled'].nil? diff --git a/config/webpack.config.js b/config/webpack.config.js index 9e6fd8aebe6..2748f5f2afe 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -55,8 +55,11 @@ var config = { notebook_viewer: './blob/notebook_viewer.js', pdf_viewer: './blob/pdf_viewer.js', pipelines: './pipelines/pipelines_bundle.js', - pipelines_details: './pipelines/pipeline_details_bundle.js', + pipelines_charts: './pipelines/pipelines_charts.js', + pipelines_details: './pipelines/pipeline_details_bundle.js', + pipelines_times: './pipelines/pipelines_times.js', profile: './profile/profile_bundle.js', + project_new: './projects/project_new.js', prometheus_metrics: './prometheus_metrics', protected_branches: './protected_branches', protected_tags: './protected_tags', |