kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

39
app/views/admin/application_settings/_form.html.haml
View file

@ -539,24 +539,27 @@
.help-block .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 you got a lot of false alarms from repository checks you can choose to clear all repository check information from the database.
%fieldset - if koding_enabled?
%legend Koding %fieldset
.form-group %legend Koding
.col-sm-offset-2.col-sm-10 .form-group
.checkbox .col-sm-offset-2.col-sm-10
= f.label :koding_enabled do .checkbox
= f.check_box :koding_enabled = f.label :koding_enabled do
Enable Koding = f.check_box :koding_enabled
.form-group Enable Koding
= f.label :koding_url, 'Koding URL', class: 'control-label col-sm-2' .help-block
.col-sm-10 Koding integration has been deprecated since GitLab 10.0. If you disable your Koding integration, you will not be able to enable it again.
= f.text_field :koding_url, class: 'form-control', placeholder: 'http://gitlab.your-koding-instance.com:8090' .form-group
.help-block = f.label :koding_url, 'Koding URL', class: 'control-label col-sm-2'
Koding has integration enabled out of the box for the .col-sm-10
%strong gitlab = f.text_field :koding_url, class: 'form-control', placeholder: 'http://gitlab.your-koding-instance.com:8090'
team, and you need to provide that team's URL here. Learn more in the .help-block
= succeed "." do Koding has integration enabled out of the box for the
= link_to "Koding administration documentation", help_page_path("administration/integration/koding") %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 %fieldset
%legend PlantUML %legend PlantUML

4
changelogs/unreleased/30162-retire-koding-integration.yml Normal file
View file

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