-
- Downloads
Merge branch 'master' into ci/persist-registration-token
* master: Move CI admin builds and runners specs to correct directory Fix 500 when viewing specific runners on runners page Fix Ci::Project migration not migrating columns that cannot be NULL Fix MySQL migration of CI emails Minor fix in flow 'Merge when build succeeds'
Showing
- app/views/admin/runners/show.html.haml 1 addition, 1 deletionapp/views/admin/runners/show.html.haml
- app/views/projects/merge_requests/widget/open/_merge_when_build_succeeds.html.haml 1 addition, 1 deletion...requests/widget/open/_merge_when_build_succeeds.html.haml
- app/views/projects/runners/_runner.html.haml 1 addition, 1 deletionapp/views/projects/runners/_runner.html.haml
- db/migrate/20151209145909_migrate_ci_emails.rb 5 additions, 1 deletiondb/migrate/20151209145909_migrate_ci_emails.rb
- db/migrate/20151210125930_migrate_ci_to_project.rb 3 additions, 3 deletionsdb/migrate/20151210125930_migrate_ci_to_project.rb
- spec/features/admin/admin_builds_spec.rb 0 additions, 0 deletionsspec/features/admin/admin_builds_spec.rb
- spec/features/admin/admin_runners_spec.rb 0 additions, 0 deletionsspec/features/admin/admin_runners_spec.rb
Loading
Please register or sign in to comment