Merge branch '30162-retire-koding-integration' into 'master'

Hide Koding setting in admin panel if not enabled

Closes #30162

See merge request !13992
This commit is contained in:
Douwe Maan 2017-09-04 08:25:42 +00:00
commit 1f59564fbf
2 changed files with 25 additions and 18 deletions

View file

@ -539,6 +539,7 @@
.help-block
If you got a lot of false alarms from repository checks you can choose to clear all repository check information from the database.
- if koding_enabled?
%fieldset
%legend Koding
.form-group
@ -547,6 +548,8 @@
= f.label :koding_enabled do
= f.check_box :koding_enabled
Enable Koding
.help-block
Koding integration has been deprecated since GitLab 10.0. If you disable your Koding integration, you will not be able to enable it again.
.form-group
= f.label :koding_url, 'Koding URL', class: 'control-label col-sm-2'
.col-sm-10

View file

@ -0,0 +1,4 @@
---
title: Deprecation of Koding integration, removal of setting in Admin Panel
merge_request: 13992
author: @mydigitalself