summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.m.gray@gmail.com>2019-04-11 14:25:52 +0000
committerAnnabel Dunstone Gray <annabel.m.gray@gmail.com>2019-04-11 14:25:52 +0000
commit225ddd146d3a575401c7592417d486e7e5833996 (patch)
tree2f33248f9326c8e36b2d0b259e3a083efccd1644
parent0276b8682e37d361adbd1ac89d9ba6992f0d1b60 (diff)
parent5b2b9fe0d688f3c08dfc08dbed879cad3ee52b4f (diff)
downloadgitlab-ce-225ddd146d3a575401c7592417d486e7e5833996.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
-rw-r--r--app/assets/javascripts/diffs/constants.js2
-rw-r--r--changelogs/unreleased/60304-long-file-names-in-mr-diffs-cause-horizontal-scrolling.yml5
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