diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-11-05 15:21:27 +0100 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-11-05 15:21:27 +0100 |
| commit | 36cecc8387932a5caffaf0b911df868815fb8949 (patch) | |
| tree | 58c8d7ce7e8f26913a65de0dff32899e2ab1bbc7 /app/assets/javascripts/flash.js | |
| parent | b9419b4da8833a2360170a16f8f72ffbe1b70068 (diff) | |
| parent | c12a4a9ac7c04a215adf6062fec7bf31231c7d4a (diff) | |
| download | gitlab-ce-feature/gb/dangling-builds.tar.gz | |
Merge branch 'master' into feature/gb/dangling-buildsfeature/gb/dangling-builds
* master: (220 commits)
Conflicts:
app/models/ci/build.rb
db/schema.rb
Diffstat (limited to 'app/assets/javascripts/flash.js')
| -rw-r--r-- | app/assets/javascripts/flash.js | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/javascripts/flash.js b/app/assets/javascripts/flash.js index 749c09f897c..c2397842125 100644 --- a/app/assets/javascripts/flash.js +++ b/app/assets/javascripts/flash.js @@ -40,7 +40,9 @@ const createFlashEl = (message, type, isFixedLayout = false) => ` class="flash-${type}" > <div - class="flash-text ${isFixedLayout ? 'container-fluid container-limited limit-container-width' : ''}" + class="flash-text ${ + isFixedLayout ? 'container-fluid container-limited limit-container-width' : '' + }" > ${_.escape(message)} </div> @@ -78,7 +80,9 @@ const createFlash = function createFlash( if (!flashContainer) return null; - const isFixedLayout = navigation ? navigation.parentNode.classList.contains('container-limited') : true; + const isFixedLayout = navigation + ? navigation.parentNode.classList.contains('container-limited') + : true; flashContainer.innerHTML = createFlashEl(message, type, isFixedLayout); |