summaryrefslogtreecommitdiff
path: root/app/views/admin/runners
Commit message (Collapse)AuthorAgeFilesLines
* Use method that creates runners registration tokenGrzegorz Bizon2015-12-231-1/+1
| | | | `runners_registration_token` now creates a new token if it is blank.
* Merge branch 'master' into ci/persist-registration-tokenGrzegorz Bizon2015-12-141-1/+1
|\ | | | | | | | | | | | | | | | | * 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'
| * Fix 500 when viewing specific runners on runners page [ci skip]Kamil Trzcinski2015-12-141-1/+1
| |
* | Merge branch 'master' into ci/persist-registration-tokenGrzegorz Bizon2015-12-141-2/+16
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* Fix runners admin view [ci skip]Kamil Trzcinski2015-12-141-1/+1
|
* Remove ci_ prefix from all ci related thingsKamil Trzcinski2015-12-111-1/+1
|
* Migrate CI::Project to ProjectKamil Trzcinski2015-12-114-0/+228