summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--VERSION2
-rw-r--r--app/assets/stylesheets/pages/merge_requests.scss6
-rw-r--r--app/views/projects/merge_requests/_mr_box.html.haml2
3 files changed, 2 insertions, 8 deletions
diff --git a/VERSION b/VERSION
index 28a62a8f64b..d0c39ac1bd2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.1.0-rc8
+11.1.0-rc9
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index c32049e1b33..2af79c511ba 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -116,10 +116,8 @@
.modify-merge-commit-link {
padding: 0;
-
background-color: transparent;
border: 0;
-
color: $gl-text-color;
&:hover,
@@ -501,10 +499,6 @@
}
}
-.merge-request-details .content-block {
- border-bottom: 0;
-}
-
.mr-source-target {
display: flex;
flex-wrap: wrap;
diff --git a/app/views/projects/merge_requests/_mr_box.html.haml b/app/views/projects/merge_requests/_mr_box.html.haml
index 8a390cf8700..1a9ab288683 100644
--- a/app/views/projects/merge_requests/_mr_box.html.haml
+++ b/app/views/projects/merge_requests/_mr_box.html.haml
@@ -1,4 +1,4 @@
-.detail-page-description.content-block
+.detail-page-description
%h2.title
= markdown_field(@merge_request, :title)