summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* add node_modules to our eslintignore settingsdont-lint-npm-modulesMike Greiling2016-12-141-0/+1
|
* Merge branch 'dz-fix-admin-routes' into 'master' Sean McGivern2016-12-1413-27/+48
|\ | | | | | | | | Add support for nested groups to admin routing See merge request !8008
| * Add support for nested groups to admin routingdz-fix-admin-routesDmitriy Zaporozhets2016-12-1113-27/+48
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'mattl-gitshell-fixes' into 'master' Rémy Coutable2016-12-141-1/+1
|\ \ | | | | | | | | | | | | Updates the docs to require GitLab Shell 4.0.3 See merge request !8050
| * \ Merge branch 'cherry-pick-f55fc1ec' into 'mattl-gitshell-fixes' mattl-gitshell-fixesMatt Lee2016-12-121-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8.14 requires GitLab shell 4.0.3 ## What does this MR do? ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [X] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? See merge request !8049
| | * | 8.14 requires GitLab shell 4.0.3Matt Lee2016-12-121-1/+1
| |/ /
* | | Merge branch 'build-statuses' into 'master' Rémy Coutable2016-12-1458-170/+1125
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Detailed build statuses ## What does this MR do? Implements detailed statuses for `Ci::Builds` and `CommitStatus`. It also adds a new icon for manual build. ## Screenshots ![manual_builds_icon](/uploads/22b5c594350856c85398ef705a635f8b/manual_builds_icon.png) ## What are the relevant issue numbers? See #24273, closes #22642 See merge request !7989
| * | | Improve build status specs contexts descriptionsGrzegorz Bizon2016-12-145-4/+6
| | | |
| * | | Add some missing tests for detailed status methodsbuild-statusesGrzegorz Bizon2016-12-143-2/+32
| | | |
| * | | Remove trailing blank line from Allowable moduleGrzegorz Bizon2016-12-141-1/+0
| | | |
| * | | Update manual build icon SVGGrzegorz Bizon2016-12-131-1/+1
| | | |
| * | | Make it possible to mix `Gitlab::Routing` inGrzegorz Bizon2016-12-133-1/+30
| | | |
| * | | Extract abilities checking module from ability modelGrzegorz Bizon2016-12-134-7/+36
| | | |
| * | | Extend tests for pipeline detailed status helpersGrzegorz Bizon2016-12-131-12/+18
| | | |
| * | | Add tests for common build detailed status helpersGrzegorz Bizon2016-12-131-0/+37
| | | |
| * | | Add missing tests for build `cancelable?` methodGrzegorz Bizon2016-12-131-0/+36
| | | |
| * | | Add tests for detailed build statuses factoryGrzegorz Bizon2016-12-131-0/+141
| | | |
| * | | Make it possible to retry build that was canceledGrzegorz Bizon2016-12-132-1/+9
| | | |
| * | | Make build retryable only if complete and executedGrzegorz Bizon2016-12-132-9/+32
| | | |
| * | | Improve readability in methods for detailed statusGrzegorz Bizon2016-12-134-4/+12
| | | |
| * | | Add tests for build cancelable/retryable statusesGrzegorz Bizon2016-12-132-0/+172
| | | |
| * | | Extend specs for build play/stop detailed statusesGrzegorz Bizon2016-12-132-7/+55
| | | |
| * | | Refine build stop/play extended status specsGrzegorz Bizon2016-12-133-35/+35
| | | |
| * | | Use manual build icon in play/stop build statusesGrzegorz Bizon2016-12-133-6/+12
| | | |
| * | | Adds manual action icon and case to show itFilipa Lacerda2016-12-132-0/+3
| | | |
| * | | Fix detailed status specs for pipeline stage modelGrzegorz Bizon2016-12-121-1/+3
| | | |
| * | | Fix detailed status badge for generic commit statusGrzegorz Bizon2016-12-121-1/+1
| | | | | | | | | | | | | | | | [ci skip]
| * | | Fix pipeline specs for detailed statusesGrzegorz Bizon2016-12-121-8/+12
| | | | | | | | | | | | | | | | [ci skip]
| * | | Add specs for build stop extended detailed statusGrzegorz Bizon2016-12-122-4/+59
| | | |
| * | | Add tests for build play extended detailed statusGrzegorz Bizon2016-12-122-3/+69
| | | |
| * | | Fix build stop extended status CSS classGrzegorz Bizon2016-12-121-4/+0
| | | |
| * | | Fix path to build status details in common helpersGrzegorz Bizon2016-12-121-1/+1
| | | |
| * | | Improve detailed status badge partialGrzegorz Bizon2016-12-128-18/+14
| | | |
| * | | Revert some unneeded changesKamil Trzcinski2016-12-121-1/+1
| | | |
| * | | Add action_class/action_titleKamil Trzcinski2016-12-125-3/+30
| | | |
| * | | Rename icon_with_label to icon_with_descriptionKamil Trzcinski2016-12-128-8/+9
| | | |
| * | | Fix auto loading of constants for Ci StatusesKamil Trzcinski2016-12-129-20/+21
| | | |
| * | | Fix some detailed statuses specs related to abilitiesGrzegorz Bizon2016-12-1210-18/+49
| | | |
| * | | Fix tests related to detailed statuses and permissionsGrzegorz Bizon2016-12-1214-41/+45
| | | | | | | | | | | | | | | | [ci skip]
| * | | Incorporate permission checks into new CI statusesGrzegorz Bizon2016-12-1211-49/+60
| | | | | | | | | | | | | | | | [ci skip]
| * | | Refactor ci status factories to DRY code a littleGrzegorz Bizon2016-12-125-29/+28
| | | |
| * | | Remove ci_status_with_icon helper and replace it with partial [ci skip]Kamil Trzcinski2016-12-128-34/+17
| | | |
| * | | Check permission of detailsKamil Trzcinski2016-12-124-7/+7
| | | |
| * | | Introduce `cancelable` and `returnable` [ci skip]Kamil Trzcinski2016-12-125-35/+64
| | | |
| * | | Improve actionsKamil Trzcinski2016-12-125-18/+110
| | | |
| * | | Added Ci::Status::BuildKamil Trzcinski2016-12-125-3/+84
| | | |
* | | | Merge branch '25651-fix-master' into 'master' Rémy Coutable2016-12-141-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix wrong error message expectation in API::Commits spec See commit message or https://gitlab.com/gitlab-org/gitlab-ce/issues/25651#note_19996076 for the explanation. Closes #25651 See merge request !8083
| * | | | Fix wrong error message expectation in API::Commits spec25651-fix-masterRémy Coutable2016-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was because the MR was a bit behind master and the error message got updated in the meantime by 79aad815. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'process-commit-worker-migration-encoding' into 'master' Rémy Coutable2016-12-143-7/+44
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Encode when migrating ProcessCommitWorker jobs ## What does this MR do? This adds encoding logic to the migration for ProcessCommitWorker, ensuring it doesn't throw errors when the input can not be converted to UTF-8 without extra help. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/25489 See merge request !8064
| * | | | | Encode when migrating ProcessCommitWorker jobsprocess-commit-worker-migration-encodingYorick Peterse2016-12-133-7/+44
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the source encoding is not UTF-8 we need to encode the data as `JSON.dump` may throw an error if the input can not be converted to UTF-8. We only encode when necessary to reduce the overhead. Fixes gitlab-org/gitlab-ce#25489
View Lorry Controller Status