diff options
| author | Grzegorz Bizon <grzegorz.bizon@ntsn.pl> | 2015-12-14 11:24:45 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz.bizon@ntsn.pl> | 2015-12-14 12:25:37 +0100 |
| commit | 32d83ee79fedc8760486ff40a2459ecb472fa51b (patch) | |
| tree | 46b8032b6bcbfd1482707a9080e6538bf44faa1c /app/views/projects/ci_settings/edit.html.haml | |
| parent | b8f67c5e4735eb25a3d03daeb95900dc87692123 (diff) | |
| parent | c81023435795766411c5954a4676ebb215af40a6 (diff) | |
| download | gitlab-ce-32d83ee79fedc8760486ff40a2459ecb472fa51b.tar.gz | |
Merge branch 'master' into ux/suppress-ci-yml-warning
* master: (24 commits)
Fix runners admin view
Fix migrations
Run builds from projects with enabled CI
Use Gitlab::Git instead of Ci::Git
Fix last specs
Fix specs
Fix after column rename
Fix errors
Update badge
Finishing touches
Fix triggers tests
Rename columns and rename migrations
Reimplement Trigger API
Remove ci_ prefix from all ci related things
Add runners token
Migrate CI::Project to Project
Fix indentation and BuildsEmailService
Change default values
Enhance migrate CI emails
Fix issue tracker service
...
Conflicts:
spec/features/commits_spec.rb
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' |