delta/gitlab/gitlab-ce.git/lib/ci, branch diff-parse-first-commit gitlab.com: gitlab-org/gitlab-ce.git Use method that creates runners registration token 2015-12-23T10:45:17+00:00 Grzegorz Bizon grzesiek.bizon@gmail.com 2015-12-23T09:48:10+00:00 3e6950481a90a83f183397f11b8f2a5d21233cfb `runners_registration_token` now creates a new token if it is blank. 
`runners_registration_token` now creates a new token if it is blank.
Merge branch 'master' into ci/persist-registration-token 2015-12-14T11:26:40+00:00 Grzegorz Bizon grzegorz.bizon@ntsn.pl 2015-12-14T10:46:02+00:00 2ec93abed7a1a3aa49b3267342824e0743de0f54 * 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 
* 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
Merge branch 'ci-project-migrate' into 'master' 2015-12-14T10:35:40+00:00 Kamil Trzciński ayufan@ayufan.eu 2015-12-14T10:35:40+00:00 c81023435795766411c5954a4676ebb215af40a6 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 

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
 Merge branch 'ci-services-migrate' into 'master' 2015-12-14T10:32:57+00:00 Kamil Trzciński ayufan@ayufan.eu 2015-12-14T10:32:57+00:00 e81ae1e68c03de4442265e4699710421e2f2755c Ci Services migrate See merge request !1985 

Ci Services migrate



See merge request !1985
 Use Gitlab::Git instead of Ci::Git 2015-12-11T17:02:32+00:00 Kamil Trzcinski ayufan@ayufan.eu 2015-12-11T16:57:04+00:00 c9ac38a074423b30b5627553bfdbf0ba15737d8e 






Fix after column rename
2015-12-11T17:02:10+00:00

Kamil Trzcinski
ayufan@ayufan.eu

2015-12-11T12:39:43+00:00

513d551c8f7078e263d31ef2c30a1f72cbab3fae












Remove ci_ prefix from all ci related things
2015-12-11T17:02:09+00:00

Kamil Trzcinski
ayufan@ayufan.eu

2015-12-10T16:44:06+00:00

64bfd9d71a4017e0b5336a2c1565926f4b8beedd












Add runners token
2015-12-11T17:02:09+00:00

Kamil Trzcinski
ayufan@ayufan.eu

2015-12-10T16:29:44+00:00

8cdd54cc0696b76daa2baf463d02d944b50bac6a












Migrate CI::Project to Project
2015-12-11T17:02:09+00:00

Kamil Trzcinski
ayufan@ayufan.eu

2015-12-04T11:55:23+00:00

e80e3f5372d6bcad1fbe04a85b3086bb66794828












Merge branch 'complexity/rubocop-metrics' into 'master'

2015-12-11T15:06:31+00:00

Douwe Maan
douwe@gitlab.com

2015-12-11T15:06:31+00:00

50f8366a8934db48d10d97de407296c026218c16


Enable rubocop metrics

This enables rubocop metrics like CyclomaticComplexity and ABCSize.
Initial threshold values are high, should be probably decreased.

See merge request !1802





Enable rubocop metrics

This enables rubocop metrics like CyclomaticComplexity and ABCSize.
Initial threshold values are high, should be probably decreased.

See merge request !1802