diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-10-05 20:06:31 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-10-05 20:06:31 +0200 |
| commit | f088ffe8f7a8b9ef429f2fb0fbdfd45fa37cde20 (patch) | |
| tree | d3bf78bcd464177800cfd466f9ebda114e8d8a71 /app/views | |
| parent | 3eef0e18e0d4561c320b4a5d9c17d7ae7aaa3d42 (diff) | |
| parent | fc59c45d58124c4fc23d62ad2ed65cbfd6cb3563 (diff) | |
| download | gitlab-ce-f088ffe8f7a8b9ef429f2fb0fbdfd45fa37cde20.tar.gz | |
Merge branch 'rs-remove-ci-disable'
See merge request !1512
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/application_settings/_form.html.haml | 9 | ||||
| -rw-r--r-- | app/views/ci/projects/disabled.html.haml | 1 |
2 files changed, 0 insertions, 10 deletions
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index 143cd10c543..a36ae0b766c 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -124,14 +124,5 @@ = f.text_area :help_page_text, class: 'form-control', rows: 4 .help-block Markdown enabled - %fieldset - %legend Continuous Integration - .form-group - .col-sm-offset-2.col-sm-10 - .checkbox - = f.label :ci_enabled do - = f.check_box :ci_enabled - Disable to prevent CI usage until rake ci:migrate is run (8.0 only) - .form-actions = f.submit 'Save', class: 'btn btn-primary' diff --git a/app/views/ci/projects/disabled.html.haml b/app/views/ci/projects/disabled.html.haml deleted file mode 100644 index 83b0d8329e1..00000000000 --- a/app/views/ci/projects/disabled.html.haml +++ /dev/null @@ -1 +0,0 @@ -Continuous Integration has been disabled for time of the migration. |