Commit graph

6 commits

Author SHA1 Message Date
Grzegorz Bizon
76a17d4f54 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'
2015-12-14 13:00:25 +00:00
Kamil Trzcinski
cb4b4c5786 Fix 500 when viewing specific runners on runners page [ci skip] 2015-12-14 12:46:26 +01:00
Grzegorz Bizon
2ec93abed7 Merge branch 'master' into ci/persist-registration-token
* master: (66 commits)
  Fix runners admin view
  Fix migrations
  Rename mention of gitlab-git-http-server to gitlab-workhorse
  Bump Redis requirement to 2.8 for Sidekiq 4 requirements
  Fix wording on runner setup page
  add details on how to change saml button label
  Fix tests
  Move awards back to gray panel and few improvements to sidebar
  Few UI improvements to new sidebar implementation
  Fix tests for new issuable sidebar
  Update changelog
  Implement new sidebar for merge request page
  Make edit link on issuable sidebar works
  Redesign issue page for new sidebar
  Move awards css to separate file
  Implement issuable sidebar partial
  Update CHANGELOG
  Clarify cache behavior
  Run builds from projects with enabled CI
  Use Gitlab::Git instead of Ci::Git
  ...

Conflicts:
	db/schema.rb
2015-12-14 12:26:40 +01:00
Kamil Trzcinski
baa38f0dc1 Fix runners admin view [ci skip] 2015-12-14 11:30:53 +01:00
Kamil Trzcinski
64bfd9d71a Remove ci_ prefix from all ci related things 2015-12-11 18:02:09 +01:00
Kamil Trzcinski
e80e3f5372 Migrate CI::Project to Project 2015-12-11 18:02:09 +01:00