summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Move CI services to project settings areaDmitriy Zaporozhets2015-10-0710-101/+61
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Remove Ci::Commit and Ci::Build controllerscleanup-ci-pagesDmitriy Zaporozhets2015-10-0710-137/+71
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Remove unused JSDmitriy Zaporozhets2015-10-072-42/+0
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Remove test for removed page and add menu highlight for build pageDmitriy Zaporozhets2015-10-072-21/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Remove Continuous Integration from project menuDmitriy Zaporozhets2015-10-076-77/+13
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Move no runners alert to project ci settingsDmitriy Zaporozhets2015-10-073-3/+4
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Move status badge helper to CI project settings for nowDmitriy Zaporozhets2015-10-072-16/+16
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'ci-build-page' into 'master' Dmitriy Zaporozhets2015-10-0732-452/+298
|\ | | | | | | | | | | | | | | | | | | | | Move CI build page to CE project * move CI build page to project * cleanup unused code * fix few 500 errors (build cancel and few CI admin pages) Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1524
| * Fix routing in CI mailerDmitriy Zaporozhets2015-10-078-10/+9
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Fix ci build routing and few testsci-build-pageDmitriy Zaporozhets2015-10-064-26/+28
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Refactor commit/build tests and fix CI cancelDmitriy Zaporozhets2015-10-065-62/+36
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Cleanup CI code after refactoring and fix several 500 errorsDmitriy Zaporozhets2015-10-0614-400/+25
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Move CI build page to CE projectDmitriy Zaporozhets2015-10-067-3/+249
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'ci-commit-page' into 'master' Dmitriy Zaporozhets2015-10-069-4/+110
|\ | | | | | | | | | | | | | | | | Render CI statuses on commit page This MR merges CI commit page into CE commit page. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1519
| * Link ci_status_path to new ci commit pageci-commit-pageDmitriy Zaporozhets2015-10-061-1/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Render CI statuses on commit pageDmitriy Zaporozhets2015-10-068-3/+108
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'fix_search_in_file_tree' into 'master' Dmitriy Zaporozhets2015-10-062-1/+5
|\ \ | | | | | | | | | | | | | | | | | | Fix search in Files https://gitlab.com/gitlab-org/gitlab-ce/issues/1873 See merge request !1511
| * | Fix search in FilesValery Sizov2015-10-062-1/+5
| | |
* | | Fix broken grouping sql clause when rendering commits for CIKamil Trzcinski2015-10-061-2/+3
| |/ |/|
* | Merge branch 'fix-ci-bugs' into 'master' Kamil Trzciński2015-10-065-15/+26
|\ \ | | | | | | | | | | | | | | | | | | Fix CI regressions introduced by ci_commit changes /cc @dzaporozhets See merge request !1518
| * | Fixed failure reading .gitlab-ci.ymlfix-ci-bugsKamil Trzcinski2015-10-061-1/+1
| | |
| * | Latest builds always include builds with unique name and unique refKamil Trzcinski2015-10-061-1/+1
| | |
| * | Fix graphical glitchesKamil Trzcinski2015-10-053-13/+24
| | |
* | | Merge branch 'closer-ci-integration' into 'master' Dmitriy Zaporozhets2015-10-062-22/+37
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use CI commit status for merge request widget For temporary compatibility with other services like Jenkins we ask for CI status via AJAX request if there is no commit status in GitLab database Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @ayufan See merge request !1517
| * | Use CI commit status for merge request widgetcloser-ci-integrationDmitriy Zaporozhets2015-10-062-22/+37
| | | | | | | | | | | | | | | | | | | | | | | | For temporary compatibility with other services like Jenkins we ask for CI status via AJAX request if there is no commit status in GitLab database Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'master' into 'master' Robert Speicher2015-10-061-0/+0
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | Remove tmp/.gitkeep This file is obsolete since 5b4aba5f as it exists solely for the directory to exist. See merge request !1506
| * | Remove tmp/.gitkeep Lasse Schuirmann2015-10-041-0/+0
| | | | | | | | | | | | This file is obsolete since 5b4aba5f as it exists solely for the directory to exist.
* | | Fix builds viewKamil Trzcinski2015-10-051-1/+1
| | |
* | | Update CHANGELOG for 8.0.4Robert Speicher2015-10-051-2/+7
| |/ |/| | | | | [ci skip]
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-10-0511-41/+9
|\ \ | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * \ Merge branch 'rs-remove-ci-disable'Kamil Trzcinski2015-10-0511-41/+9
| |\ \ | | | | | | | | | | | | See merge request !1512
| | * | Remove the option to disable CIrs-remove-ci-disableRobert Speicher2015-10-0511-41/+9
| | | | | | | | | | | | | | | | | | | | | | | | This option only existed to ease the CI-to-CE/EE migration process. This commit partially reverts 8b05abe816b0c681ac218096b294311dd04fde8b
* | | | Merge branch 'gopeter-user-preferences-layout-option'Dmitriy Zaporozhets2015-10-059-2/+35
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'user-preferences-layout-option' of ↵Dmitriy Zaporozhets2015-10-059-2/+35
| |\ \ \ |/ / / / | | | | | | | | | | | | | | | | https://github.com/gopeter/gitlabhq into gopeter-user-preferences-layout-option Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | improved code style and layout option namingPeter Göbel2015-10-056-7/+7
| | | |
| * | | added user preference to change layout widthPeter Göbel2015-10-059-2/+35
| | | |
* | | | Merge branch 'refactor-build-service' into 'master' Kamil Trzciński2015-10-0555-604/+570
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor Ci::Commit and Ci::Build to have all builds for same :sha on single page This makes Ci::Commit to have only :sha and simplifies routing to have only :sha in path. The :ref and :push_data is now parameter of Ci::Build. All commit related data (git author, message and .gitlab-ci.yml) is read directly from repository. All code related for creating builds is moved to CreateBuildsService. Status deduction is rewritten to make if more efficient and easier to integrate with Commit Status API. This is partially working, tests are not yet touched. This slightly changes view of Commit: ![Screen_Shot_2015-10-02_at_15.21.47](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ad3f1ccdcc87659ea437d8db6c5b9f94/Screen_Shot_2015-10-02_at_15.21.47.png) @dzaporozhets What do you think? See merge request !1502
| * | | | Fix create_trigger_request_service_specrefactor-build-serviceKamil Trzcinski2015-10-053-7/+8
| | | | |
| * | | | Fix gitlab_ci_yaml_processor specsKamil Trzcinski2015-10-051-0/+3
| | | | |
| * | | | Fix GitLabCiService and remove ci_yaml_file from CI push dataKamil Trzcinski2015-10-054-43/+13
| | | | |
| * | | | Add stage testsKamil Trzcinski2015-10-052-1/+36
| | | | |
| * | | | Make rubocop happyKamil Trzcinski2015-10-052-3/+3
| | | | |
| * | | | Fix db/schema.rbKamil Trzcinski2015-10-051-58/+36
| | | | |
| * | | | Fix rest of testsKamil Trzcinski2015-10-056-136/+67
| | | | |
| * | | | Fix build pipeliningKamil Trzcinski2015-10-053-2/+68
| | | | |
| * | | | Fix next bunch of testsKamil Trzcinski2015-10-054-10/+23
| | | | |
| * | | | Fix triggers specKamil Trzcinski2015-10-052-26/+15
| | | | |
| * | | | Fix next round of testsKamil Trzcinski2015-10-0520-101/+103
| | | | |
| * | | | Fix builds_without_retryKamil Trzcinski2015-10-053-13/+10
| | | | |
| * | | | Make commit_spec runKamil Trzcinski2015-10-0513-208/+226
| | | | |
View Lorry Controller Status