diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2015-12-14 10:35:40 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2015-12-14 10:35:40 +0000 |
| commit | c81023435795766411c5954a4676ebb215af40a6 (patch) | |
| tree | 4b71817f8c5d6986c28b70353459a544fe444519 /app/views/projects/ci_settings/edit.html.haml | |
| parent | e81ae1e68c03de4442265e4699710421e2f2755c (diff) | |
| parent | baa38f0dc1a0e1af84cd06a35450d772eee2d1c4 (diff) | |
| download | gitlab-ce-c81023435795766411c5954a4676ebb215af40a6.tar.gz | |
Merge branch 'ci-project-migrate' into 'master'
Ci Project migrate
- This doesn't migrate: allow_git_fetch, coverage_regex, timeout. Since this are project configuration settings I would propose to migrate them to `.gitlab-ci.yml`.
- This requires offline migrations.
- It simplifies database models making all CI objects to be attached to: Project.
- It removes Ci::Project, but makes /ci/projects working by adding method: Project.find_by_ci_id for backward compatibility (badges, triggers).
- We should add default `timeout` to Application Settings.
- It misses specs.
- It is based on ci-services-migrate for now.
- It removes CI events.
- It removes administrator CI projects overview.
- It removes CI application settings.
In 8.4 or 8.5 we can remove redundant tables and columns.
See merge request !1987
Diffstat (limited to 'app/views/projects/ci_settings/edit.html.haml')
| -rw-r--r-- | app/views/projects/ci_settings/edit.html.haml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/app/views/projects/ci_settings/edit.html.haml b/app/views/projects/ci_settings/edit.html.haml deleted file mode 100644 index acc912d4596..00000000000 --- a/app/views/projects/ci_settings/edit.html.haml +++ /dev/null @@ -1,6 +0,0 @@ -- page_title "CI Settings" - -- if no_runners_for_project?(@ci_project) - = render 'no_runners' - -= render 'form' |