app/controllers/projects/clusters_controller.rb · d363014c36708864df09f39cb64415073a1430a0 · Boxiang Sun / gitlab-ce

Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabs · d363014c

Dennis Tang authored May 31, 2018

# Conflicts:
#	app/controllers/projects/clusters/gcp_controller.rb
#	app/views/projects/clusters/gcp/_form.html.haml
#	app/views/projects/clusters/gcp/login.html.haml

d363014c

clusters_controller.rb 5.38 KB

Replace clusters_controller.rb