summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/clusters
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2018-05-30 14:26:54 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2018-05-30 14:26:54 +0300
commitef5282ee368ba15207c86b67bf224b3b54efcce1 (patch)
tree87219d9c86899effb6c4cebc19ef7ce642df2869 /app/assets/javascripts/clusters
parent6f5206178d3105ba78ec609450104ede50470e7d (diff)
parent8df2e8cfb8973fafb11041bde04600a2823baf85 (diff)
downloadgitlab-ce-ef5282ee368ba15207c86b67bf224b3b54efcce1.tar.gz
Merge remote-tracking branch 'origin/master' into 46487-add-support-for-jupyter-in-gitlab-via-kubernetes
Diffstat (limited to 'app/assets/javascripts/clusters')
-rw-r--r--app/assets/javascripts/clusters/components/applications.vue4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/clusters/components/applications.vue b/app/assets/javascripts/clusters/components/applications.vue
index 17a0e1b3071..9d6be555a2c 100644
--- a/app/assets/javascripts/clusters/components/applications.vue
+++ b/app/assets/javascripts/clusters/components/applications.vue
@@ -197,11 +197,11 @@ export default {
:value="ingressExternalIp"
readonly
/>
- <span class="input-group-btn">
+ <span class="input-group-append">
<clipboard-button
:text="ingressExternalIp"
:title="s__('ClusterIntegration|Copy Ingress IP Address to clipboard')"
- class="js-clipboard-btn"
+ class="input-group-text js-clipboard-btn"
/>
</span>
</div>