diff options
| author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-04-11 14:25:52 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-04-12 10:26:26 +0000 |
| commit | 8680918d8255b2ff6e04d5b13e2daad6b230bbb6 (patch) | |
| tree | ba6ae138a42f059da5dbcaa7307f05cea85b6b7b | |
| parent | b3cef5592af18b9303339a468f9187113f1b52ae (diff) | |
| download | gitlab-ce-8680918d8255b2ff6e04d5b13e2daad6b230bbb6.tar.gz | |
Merge branch '60304-long-file-names-in-mr-diffs-cause-horizontal-scrolling' into 'master'
Resolve "Long file names in MR diffs cause horizontal scrolling"
Closes #60304
See merge request gitlab-org/gitlab-ce!27233
(cherry picked from commit 225ddd146d3a575401c7592417d486e7e5833996)
5b2b9fe0 Only make margin-auto on large screens for diff file header
| -rw-r--r-- | app/assets/javascripts/diffs/constants.js | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/60304-long-file-names-in-mr-diffs-cause-horizontal-scrolling.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/diffs/constants.js b/app/assets/javascripts/diffs/constants.js index 5dabe224baa..4feb73cfef2 100644 --- a/app/assets/javascripts/diffs/constants.js +++ b/app/assets/javascripts/diffs/constants.js @@ -49,4 +49,4 @@ export const TYPE_KEY = 'type'; export const LEFT_LINE_KEY = 'left'; export const CENTERED_LIMITED_CONTAINER_CLASSES = - 'container-limited limit-container-width mx-auto px-3'; + 'container-limited limit-container-width mx-lg-auto px-3'; diff --git a/changelogs/unreleased/60304-long-file-names-in-mr-diffs-cause-horizontal-scrolling.yml b/changelogs/unreleased/60304-long-file-names-in-mr-diffs-cause-horizontal-scrolling.yml new file mode 100644 index 00000000000..ec5e9e4703b --- /dev/null +++ b/changelogs/unreleased/60304-long-file-names-in-mr-diffs-cause-horizontal-scrolling.yml @@ -0,0 +1,5 @@ +--- +title: Fix long file header names bug in diffs +merge_request: 27233 +author: +type: fixed |