diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2019-08-09 16:08:15 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2019-08-09 16:08:15 +0000 |
commit | 42ccb425a4bf05d067e07f6e5c7e096ab87e5cb5 (patch) | |
tree | c7e14de0bb94f8b5aec3a4ea66cc29fdc1e77181 | |
parent | d8f1cb398f9ddf2337bd2c405c64f6bca1789f7c (diff) | |
parent | f7135aab34ceaf2aed532296e4cb84202fa18287 (diff) | |
download | gitlab-ce-42ccb425a4bf05d067e07f6e5c7e096ab87e5cb5.tar.gz |
Merge branch 'fix-job-log-formatting' into 'master'
Fix job log where spans were displayed in block
Closes #65686
See merge request gitlab-org/gitlab-ce!31674
-rw-r--r-- | app/assets/stylesheets/pages/builds.scss | 5 | ||||
-rw-r--r-- | changelogs/unreleased/fix-job-log-formatting.yml | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss index 262c0bf5ed2..6fc742871e7 100644 --- a/app/assets/stylesheets/pages/builds.scss +++ b/app/assets/stylesheets/pages/builds.scss @@ -124,11 +124,6 @@ float: left; padding-left: $gl-padding-8; } - - .section-header ~ .section.line { - margin-left: $gl-padding; - display: block; - } } .build-header { diff --git a/changelogs/unreleased/fix-job-log-formatting.yml b/changelogs/unreleased/fix-job-log-formatting.yml new file mode 100644 index 00000000000..0dd545aaecc --- /dev/null +++ b/changelogs/unreleased/fix-job-log-formatting.yml @@ -0,0 +1,5 @@ +--- +title: Fix job logs where style changes were broken down into separate lines +merge_request: 31674 +author: +type: fixed |