diff options
| author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-04-04 13:57:42 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-04-04 13:57:42 +0000 |
| commit | 702f18261a2ac0b45e2b002055950816ad34e92c (patch) | |
| tree | 4e6f243e893941f20cbbd1b378e4833f622592f7 | |
| parent | 54de12b6959b7b07a870466b1cb24806adc00fa3 (diff) | |
| parent | e1850718034bceaf9ef521d21592cb1d8d84cb6a (diff) | |
| download | gitlab-ce-error-pipelines-for-blocked-users.tar.gz | |
Merge branch 'revert-4e045cd5' into 'master'error-pipelines-for-blocked-users
Revert "Merge branch 'fix/missing-border' into 'master'"
See merge request gitlab-org/gitlab-ce!26980
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 1 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-missing-border.yml | 5 |
2 files changed, 0 insertions, 6 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 0c334e919de..fd07415a52f 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -44,7 +44,6 @@ $note-form-margin-left: 72px; border: 1px solid $border-color; border-radius: $border-radius-default; margin: $gl-padding 0; - overflow: auto; &.system-note, &.note-form { diff --git a/changelogs/unreleased/fix-missing-border.yml b/changelogs/unreleased/fix-missing-border.yml deleted file mode 100644 index 21728223cb8..00000000000 --- a/changelogs/unreleased/fix-missing-border.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fixes missing border color in discussion card component -merge_request: 26242 -author: Farhad Yasir -type: fixed |