diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2017-09-06 15:16:38 +0200 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2017-09-06 15:16:38 +0200 |
| commit | 8189347b4986e2e44b30d04bf9e83c11e76feef8 (patch) | |
| tree | 2de0e9b37d8938966fa48876b83313fb76b99b6f /app/views/admin | |
| parent | c288ca78b42986ea1cc315d46d58fc25f7ff8f85 (diff) | |
| parent | b97f9629cabadca1125351a8aa514791524dea3f (diff) | |
| download | gitlab-ce-8189347b4986e2e44b30d04bf9e83c11e76feef8.tar.gz | |
Merge branch 'master' into zj-auto-devops-table
Diffstat (limited to 'app/views/admin')
| -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 85524091204..dbaed1d09fb 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -549,24 +549,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 |