From ceadbdb71019de055071f5e838e1dca31f25d5a8 Mon Sep 17 00:00:00 2001 From: Dimitrie Hoekstra Date: Fri, 7 Oct 2016 15:15:20 +0200 Subject: [PATCH 1/4] shortened merge request modal to let clipboard button not overlap --- app/assets/stylesheets/pages/merge_requests.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index bc8693ae467f..85cea2da5bfb 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -249,7 +249,9 @@ #modal_merge_info .modal-dialog { width: 600px; - + .dark{ + margin-right: 40px; + } .btn-clipboard { @extend .pull-right; -- GitLab From e10171eed26bb68aaf79092c340177baf7abf4c2 Mon Sep 17 00:00:00 2001 From: Dimitrie Hoekstra Date: Fri, 7 Oct 2016 15:16:03 +0200 Subject: [PATCH 2/4] added entry to changelog --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 392a356c79a8..3c384247ccc3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -110,6 +110,7 @@ v 8.12.2 - Fix bug where 'Search results' repeated many times when a search in the emoji search form is cleared (Xavier Bick) (@zeiv) - Fix resolve discussion buttons endpoint path - Refactor remnants of CoffeeScript destructured opts and super !6261 + - Shortened merge request modal to let clipboard button not overlap v 8.12.1 - Fix a memory leak in HTML::Pipeline::SanitizationFilter::WHITELIST -- GitLab From 4283bfe19cb9ff3d3542eff31d333291e0a0b0c6 Mon Sep 17 00:00:00 2001 From: Dimitrie Hoekstra Date: Thu, 27 Oct 2016 14:27:56 +0200 Subject: [PATCH 3/4] makes code complient to linting --- app/assets/stylesheets/pages/merge_requests.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 6e12c1d5b6c7..f7557d57ac44 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -269,9 +269,11 @@ #modal_merge_info .modal-dialog { width: 600px; - .dark{ + + .dark { margin-right: 40px; } + .btn-clipboard { @extend .pull-right; -- GitLab From f01c10ccdb45874334c6964984b9d6db876b2be4 Mon Sep 17 00:00:00 2001 From: Dimitrie Hoekstra Date: Thu, 27 Oct 2016 16:39:10 +0200 Subject: [PATCH 4/4] changed changelog annotation to release 8.14 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3cb73999ed69..94dc8654c0c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ Please view this file on the master branch, on stable branches it's out of date. - Show full status link on MR & commit pipelines - Fix documents and comments on Build API `scope` - Refactor email, use setter method instead AR callbacks for email attribute (Semyon Pupkov) + - Shortened merge request modal to let clipboard button not overlap ## 8.13.1 (2016-10-25) - Fix branch protection API. !6215 @@ -255,7 +256,6 @@ Please view this file on the master branch, on stable branches it's out of date. - Fix bug where 'Search results' repeated many times when a search in the emoji search form is cleared (Xavier Bick) (@zeiv) - Fix resolve discussion buttons endpoint path - Refactor remnants of CoffeeScript destructured opts and super !6261 - - Shortened merge request modal to let clipboard button not overlap - Prevent running GfmAutocomplete setup for each diff note !6569 ## 8.12.1 -- GitLab