gitlab-org--gitlab-foss/lib/ci
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
..
api Merge branch 'master' into ci/persist-registration-token 2015-12-14 12:26:40 +01:00
assets Groundwork for merging CI into CE 2015-08-25 18:42:46 -07:00
ansi2html.rb Groundwork for merging CI into CE 2015-08-25 18:42:46 -07:00
charts.rb Remove ci_ prefix from all ci related things 2015-12-11 18:02:09 +01:00
gitlab_ci_yaml_processor.rb Merge branch 'complexity/rubocop-metrics' into 'master' 2015-12-11 15:06:31 +00:00
model.rb Groundwork for merging CI into CE 2015-08-25 18:42:46 -07:00
static_model.rb Groundwork for merging CI into CE 2015-08-25 18:42:46 -07:00
status.rb Shut up, Rubocop 2015-10-15 19:44:15 -04:00
version_info.rb Groundwork for merging CI into CE 2015-08-25 18:42:46 -07:00