summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | make migration reversibleValery Sizov2015-04-271-5/+5
|/ /
* | Merge branch 'concurent_runners' into 'master'Dmitriy Zaporozhets2015-04-241-1/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve situation with concurent runners registration https://dev.gitlab.org/gitlab/gitlab-ci/issues/209 https://github.com/gitlabhq/gitlab-ci/issues/458 See merge request !82
| * | resolve situation with concurent ruuners registrationValery Sizov2015-04-241-1/+6
|/ /
* | Merge branch 'builds_tabs' into 'master'Dmitriy Zaporozhets2015-04-244-0/+66
|\ \ | | | | | | | | | | | | | | | | | | | | | Pending and Running tabs on admin builds page https://dev.gitlab.org/gitlab/gitlab-ci/issues/212 See merge request !81
| * | update changelogValery Sizov2015-04-241-0/+1
| | |
| * | Tabs Pending and Running on admin builds pageValery Sizov2015-04-243-0/+65
| | |
* | | Merge branch 'master' into 'master'Valery Sizov2015-04-241-3/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | grammar fix to readme See merge request !80
| * | | grammar fix to readmeJeff Pelton2015-04-241-3/+2
|/ / /
* | | Merge branch 'refactoring_user_url' into 'master'Dmitriy Zaporozhets2015-04-2317-60/+53
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | Refactoring network related code https://dev.gitlab.org/gitlab/gitlab-ci/issues/139 See merge request !74
| * | refactoring network related coderefactoring_user_urlValery Sizov2015-04-2217-60/+53
| | |
* | | Merge branch 'search_progressbar' into 'master'Valery Sizov2015-04-232-0/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Progressbar for projects search https://dev.gitlab.org/gitlab/gitlab-ci/issues/214 See merge request !79
| * | | progressbar for projects searchValery Sizov2015-04-232-0/+2
|/ / /
* | | Merge branch 'duration' into 'master'Valery Sizov2015-04-2311-8/+86
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix duration visualisation https://dev.gitlab.org/gitlab/gitlab-ci/issues/174 https://github.com/gitlabhq/gitlab-ci/issues/565 See merge request !78
| * | | fix duration visualisationValery Sizov2015-04-2311-8/+86
| | | |
* | | | Merge branch 'project-runners-page' into 'master'Dmitriy Zaporozhets2015-04-2321-91/+381
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved runner page for project Tasks: - [x] Ability to add runner to several projects - [x] Render runner status (online, offline, disabled) - [x] Two column style of page: specific and shared runners - [x] Toggle shared runners for project - [x] Fix tests - [x] Write tests for new functionality - [x] Remove runner instead disabling if it is last project for this runner - [x] Cleanup and refactor code - [x] Improve query for authorised runners (reject duplicates) - [x] Improve UI based on https://dev.gitlab.org/gitlab/gitlab-ci/issues/185#note_41582 See merge request !61
| * | | update changelogproject-runners-pageValery Sizov2015-04-211-0/+3
| | | |
| * | | runner page: specsValery Sizov2015-04-219-13/+160
| | | |
| * | | runner page: remove duplicationValery Sizov2015-04-212-2/+2
| | | |
| * | | runners page: UI improvementsValery Sizov2015-04-214-13/+15
| | | |
| * | | runners page: cleanupValery Sizov2015-04-211-6/+2
| | | |
| * | | toggle shared runnersValery Sizov2015-04-215-13/+12
| | | |
| * | | Improved runner page for projectDmitriy Zaporozhets2015-04-2113-74/+219
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ability to add runner to several projects * render runner status (online, offline, disabled) * two column style of page: specific and shared runners Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'doc_minor_fix' into 'master'Valery Sizov2015-04-221-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Minor documentation fix See merge request !77
| * | | | minor documentation fixValery Sizov2015-04-221-1/+1
|/ / / /
* | | | Merge branch 'build_page_link_to_project' into 'master'Valery Sizov2015-04-221-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clickable project name on build page https://dev.gitlab.org/gitlab/gitlab-ci/issues/208 https://github.com/gitlabhq/gitlab-ci/issues/577 See merge request !76
| * | | | clickable project name on build pageValery Sizov2015-04-221-1/+1
|/ / / /
* | | | Merge branch 'templates' into 'master'Valery Sizov2015-04-223-10/+11
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Improve email templates https://dev.gitlab.org/gitlab/gitlab-ci/issues/166 See merge request !75
| * | | improve email templatestemplatesValery Sizov2015-04-223-10/+11
|/ / /
* | | Merge branch 'improve_test_coverage' into 'master'Valery Sizov2015-04-229-17/+98
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved test coverage https://dev.gitlab.org/gitlab/gitlab-ci/issues/203 See merge request !68
| * | | Improved test coverageimprove_test_coverageValery Sizov2015-04-179-17/+98
| | |/ | |/|
* | | Merge branch 'project_search' into 'master'Valery Sizov2015-04-2211-15/+74
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Projects search on dashboard https://dev.gitlab.org/gitlab/gitlab-ci/issues/173 ![Screenshot_2015-04-21_16.36.58](https://gitlab.com/gitlab-org/gitlab-ci/uploads/d7b6c3d82f71fc920aa484a950ac48a2/Screenshot_2015-04-21_16.36.58.png) See merge request !73
| * | | update changelogproject_searchValery Sizov2015-04-211-0/+3
| | | |
| * | | projects search on dashboardValery Sizov2015-04-2110-15/+73
| | |/ | |/|
* | | Merge branch 'deploy_job_api' into 'master'Valery Sizov2015-04-225-7/+120
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | API for deploy jobs https://dev.gitlab.org/gitlab/gitlab-ci/issues/192 See merge request !69
| * | update changelogdeploy_job_apiValery Sizov2015-04-211-0/+3
| | |
| * | API for deploy jobsValery Sizov2015-04-214-7/+117
|/ /
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ciValery Sizov2015-04-211-0/+1
|\ \
| * \ Merge branch 'runners-on-index-doc' into 'master'Valery Sizov2015-04-211-0/+1
| |\ \ | | |/ | |/| | | | | | | | | | add runners to documentation index See merge request !72
| | * add runners to documentation indexJob van der Voort2015-04-211-0/+1
| |/
* | Merge branch 'api_security_fix' into 'master'Dmitriy Zaporozhets2015-04-201-5/+5
|\ \ | |/ |/| | | | | | | | | | | Only who has manage access can manage project https://dev.gitlab.org/gitlab/gitlab-ci/issues/205 See merge request !151
| * only who has manage access can manage projectValery Sizov2015-04-171-5/+5
|/
* Merge branch 'cleanup' into 'master'Valery Sizov2015-04-179-40/+17
|\ | | | | | | | | | | | | | | Cleanup the build model https://dev.gitlab.org/gitlab/gitlab-ci/issues/202 See merge request !67
| * fix build status jsonValery Sizov2015-04-171-1/+1
| |
| * annotatecleanupValery Sizov2015-04-175-18/+5
| |
| * cleanup build modelValery Sizov2015-04-174-21/+11
|/
* Merge branch 'job_soft_deletion' into 'master'Dmitriy Zaporozhets2015-04-156-3/+19
|\ | | | | | | | | | | | | | | Job soft deletion Fixes https://dev.gitlab.org/gitlab/gitlab-ci/issues/200 See merge request !66
| * Job soft deletionValery Sizov2015-04-156-2/+18
| |
| * prevent 500 error when job is deletedValery Sizov2015-04-151-1/+1
| |
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ciValery Sizov2015-04-152-13/+13
|\ \
| * \ Merge branch 'more-rubocop-rules' into 'master'Valery Sizov2015-04-152-13/+13
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | Enable more rubocop rules Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !65