summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/pages/merge_requests.scss
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2019-03-20 22:25:23 +0000
committerClement Ho <clemmakesapps@gmail.com>2019-03-20 22:25:23 +0000
commit6a0702fe9382c2b3c4a72421054d46821a95c781 (patch)
tree9e72a10dfddcf1b93019e2903393dbc3edc0fb85 /app/assets/stylesheets/pages/merge_requests.scss
parentf7fcfc7720c5149e2fa6f027900503ae3f215bf1 (diff)
parent0c3df3b56973d78345c6791cc3882a50d916cbc8 (diff)
downloadgitlab-ce-6a0702fe9382c2b3c4a72421054d46821a95c781.tar.gz
Merge branch '57115-just-in-time-k8s-resource-creation' into 'master'
Create project-specific Kubernetes resources just-in-time See merge request gitlab-org/gitlab-ce!25586
Diffstat (limited to 'app/assets/stylesheets/pages/merge_requests.scss')
-rw-r--r--app/assets/stylesheets/pages/merge_requests.scss1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index df3a4be6559..7f8b8ea8100 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -166,6 +166,7 @@
float: left;
.accept-merge-request {
+ &.ci-preparing,
&.ci-pending,
&.ci-running {
@include btn-blue;