diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-04-06 13:40:30 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-04-06 13:40:30 +0000 |
| commit | 88f33a1266ca51d48272e858c399daedd837575f (patch) | |
| tree | 9c0da433d01a0cf01cdc0ded774c8b85a949403f /app/assets/javascripts/pipelines.js | |
| parent | b3ea598b1aeaf7f3eb0071b60f97247ad67e69f4 (diff) | |
| parent | 8199ff7bd71ce91fbc945b2c31010fcf654bda67 (diff) | |
| download | gitlab-ce-update-trace-handling-code.tar.gz | |
Merge branch 'master' into 'update-trace-handling-code'update-trace-handling-code
# Conflicts:
# app/assets/javascripts/build.js
Diffstat (limited to 'app/assets/javascripts/pipelines.js')
| -rw-r--r-- | app/assets/javascripts/pipelines.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/assets/javascripts/pipelines.js b/app/assets/javascripts/pipelines.js index 9203abefbbc..4252b615887 100644 --- a/app/assets/javascripts/pipelines.js +++ b/app/assets/javascripts/pipelines.js @@ -9,6 +9,10 @@ require('./lib/utils/bootstrap_linked_tabs'); new global.LinkedTabs(options.tabsOptions); } + if (options.pipelineStatusUrl) { + gl.utils.setCiStatusFavicon(options.pipelineStatusUrl); + } + this.addMarginToBuildColumns(); } |