diff options
| author | Phil Hughes <me@iamphill.com> | 2019-07-02 16:26:41 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-07-02 16:26:41 +0000 |
| commit | 5fb1de48ccbd5f637b6a8d2d9889a480d7d359a2 (patch) | |
| tree | 156e64839d1d7a58f37120c7c69a38717d575a6e /app | |
| parent | bd279ec06a7d5bc5788edfc31ad32191cf8cc54a (diff) | |
| parent | 00adf2428de8a8e1c05e4707ccd17f239803507e (diff) | |
| download | gitlab-ce-5fb1de48ccbd5f637b6a8d2d9889a480d7d359a2.tar.gz | |
Merge branch '12534-clusters' into 'master'
Backports css class used in EE specs
Closes gitlab-ee#12534
See merge request gitlab-org/gitlab-ce!30258
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/clusters/clusters/_form.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/clusters/clusters/_form.html.haml b/app/views/clusters/clusters/_form.html.haml index 455322b2089..3d0266a2d5b 100644 --- a/app/views/clusters/clusters/_form.html.haml +++ b/app/views/clusters/clusters/_form.html.haml @@ -1,4 +1,4 @@ -= form_for @cluster, url: clusterable.cluster_path(@cluster), as: :cluster do |field| += form_for @cluster, url: clusterable.cluster_path(@cluster), as: :cluster, html: { class: 'cluster_integration_form' } do |field| = form_errors(@cluster) .form-group %h5= s_('ClusterIntegration|Integration status') |