diff options
| author | Luke Bennett <lbennett@gitlab.com> | 2018-06-07 08:56:41 +0300 |
|---|---|---|
| committer | Luke Bennett <lbennett@gitlab.com> | 2018-06-07 08:56:41 +0300 |
| commit | a97f4ec3615595694b11676484e9ac1ba5524a9e (patch) | |
| tree | c82ad96af00a0cdd898f26a8e1da5a9bdae14819 /app/views/shared | |
| parent | 119b128ec8415a074a73b73a7878717779c6e0f3 (diff) | |
| parent | 760b12dc6b3a927c918855e2ee85a1c0e6bddb73 (diff) | |
Merge branch 'master' into '39549-label-list-page-redesign-with-draggable-labels'
# Conflicts:
# app/views/projects/labels/index.html.haml
Diffstat (limited to 'app/views/shared')
| -rw-r--r-- | app/views/shared/builds/_build_output.html.haml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/views/shared/builds/_build_output.html.haml b/app/views/shared/builds/_build_output.html.haml new file mode 100644 index 00000000000..07f1501fadd --- /dev/null +++ b/app/views/shared/builds/_build_output.html.haml @@ -0,0 +1,3 @@ +%pre.build-trace#build-trace + %code.bash.js-build-output + .build-loader-animation.js-build-refresh |