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:
commit
1f59564fbf
2 changed files with 25 additions and 18 deletions
|
@ -539,24 +539,27 @@
|
|||
.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.
|
||||
|
||||
%fieldset
|
||||
%legend Koding
|
||||
.form-group
|
||||
.col-sm-offset-2.col-sm-10
|
||||
.checkbox
|
||||
= f.label :koding_enabled do
|
||||
= f.check_box :koding_enabled
|
||||
Enable Koding
|
||||
.form-group
|
||||
= f.label :koding_url, 'Koding URL', class: 'control-label col-sm-2'
|
||||
.col-sm-10
|
||||
= f.text_field :koding_url, class: 'form-control', placeholder: 'http://gitlab.your-koding-instance.com:8090'
|
||||
.help-block
|
||||
Koding has integration enabled out of the box for the
|
||||
%strong gitlab
|
||||
team, and you need to provide that team's URL here. Learn more in the
|
||||
= succeed "." do
|
||||
= link_to "Koding administration documentation", help_page_path("administration/integration/koding")
|
||||
- if koding_enabled?
|
||||
%fieldset
|
||||
%legend Koding
|
||||
.form-group
|
||||
.col-sm-offset-2.col-sm-10
|
||||
.checkbox
|
||||
= 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
|
||||
= f.text_field :koding_url, class: 'form-control', placeholder: 'http://gitlab.your-koding-instance.com:8090'
|
||||
.help-block
|
||||
Koding has integration enabled out of the box for the
|
||||
%strong gitlab
|
||||
team, and you need to provide that team's URL here. Learn more in the
|
||||
= succeed "." do
|
||||
= link_to "Koding administration documentation", help_page_path("administration/integration/koding")
|
||||
|
||||
%fieldset
|
||||
%legend PlantUML
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
title: Deprecation of Koding integration, removal of setting in Admin Panel
|
||||
merge_request: 13992
|
||||
author: @mydigitalself
|
Loading…
Reference in a new issue