summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-09-21 05:45:02 +0000
committerPhil Hughes <me@iamphill.com>2018-09-21 05:45:02 +0000
commita5491fd12d12715001a6383a1fd940edd4a1ae32 (patch)
tree0f42b7b4dc613bfdcdd6bcb1f793231683c6ba42
parent0d1576c420c0420cc561972a95986e72fc8bbf17 (diff)
parent5f808174f205e23d6938ec959001b3018e71e8bb (diff)
downloadgitlab-ce-a5491fd12d12715001a6383a1fd940edd4a1ae32.tar.gz
Merge branch '41040-long-webhook-url-problem' into 'master'
Fix long webhook URL overflow for custom integration Closes #41040 See merge request gitlab-org/gitlab-ce!21668
-rw-r--r--app/assets/stylesheets/framework/lists.scss1
-rw-r--r--changelogs/unreleased/41040-long-webhook-url-problem.yml5
2 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/lists.scss b/app/assets/stylesheets/framework/lists.scss
index fdc0454d837..d9d4a210f5f 100644
--- a/app/assets/stylesheets/framework/lists.scss
+++ b/app/assets/stylesheets/framework/lists.scss
@@ -111,6 +111,7 @@ ul.content-list {
border-color: $white-normal;
font-size: $gl-font-size;
color: $gl-text-color;
+ word-break: break-word;
&.no-description {
.title {
diff --git a/changelogs/unreleased/41040-long-webhook-url-problem.yml b/changelogs/unreleased/41040-long-webhook-url-problem.yml
new file mode 100644
index 00000000000..4057e1ff325
--- /dev/null
+++ b/changelogs/unreleased/41040-long-webhook-url-problem.yml
@@ -0,0 +1,5 @@
+---
+title: Fix long webhook URL overflow for custom integration.
+merge_request:
+author: Kukovskii Vladimir
+type: fixed