diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-09-04 11:25:42 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-09-04 11:25:42 +0300 |
commit | 1f59564fbf7b48350b43cc3e1659c33c92759151 (patch) | |
tree | 1d02c921f9fd6adc14b370b79581235dfd6f9500 /app | |
parent | d449355f94e54788efb70e8998327720060afddc (diff) | |
parent | 52c94e25d2193a8972db0f7b2423abbfe9ae6a02 (diff) |
Merge branch '30162-retire-koding-integration' into 'master'
Hide Koding setting in admin panel if not enabled
Closes #30162
See merge request !13992
Diffstat (limited to 'app')
-rw-r--r-- | app/views/admin/application_settings/_form.html.haml | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index b38433326fc..a010b4691bf 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -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 |