| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Username exists check respects the relative root URLusername-exists-root | Phil Hughes | 2016-12-14 | 2 | -1/+5 |
| | | | | | Closes #25548 | ||||
| * | Merge branch 'mattl-gitshell-fixes' into 'master' | Rémy Coutable | 2016-12-14 | 1 | -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-fixes | Matt Lee | 2016-12-12 | 1 | -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.3 | Matt Lee | 2016-12-12 | 1 | -1/+1 |
| | |/ | |||||
| * | | Merge branch 'build-statuses' into 'master' | Rémy Coutable | 2016-12-14 | 58 | -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  ## What are the relevant issue numbers? See #24273, closes #22642 See merge request !7989 | ||||
| | * | | Improve build status specs contexts descriptions | Grzegorz Bizon | 2016-12-14 | 5 | -4/+6 |
| | | | | |||||
| | * | | Add some missing tests for detailed status methodsbuild-statuses | Grzegorz Bizon | 2016-12-14 | 3 | -2/+32 |
| | | | | |||||
| | * | | Remove trailing blank line from Allowable module | Grzegorz Bizon | 2016-12-14 | 1 | -1/+0 |
| | | | | |||||
| | * | | Update manual build icon SVG | Grzegorz Bizon | 2016-12-13 | 1 | -1/+1 |
| | | | | |||||
| | * | | Make it possible to mix `Gitlab::Routing` in | Grzegorz Bizon | 2016-12-13 | 3 | -1/+30 |
| | | | | |||||
| | * | | Extract abilities checking module from ability model | Grzegorz Bizon | 2016-12-13 | 4 | -7/+36 |
| | | | | |||||
| | * | | Extend tests for pipeline detailed status helpers | Grzegorz Bizon | 2016-12-13 | 1 | -12/+18 |
| | | | | |||||
| | * | | Add tests for common build detailed status helpers | Grzegorz Bizon | 2016-12-13 | 1 | -0/+37 |
| | | | | |||||
| | * | | Add missing tests for build `cancelable?` method | Grzegorz Bizon | 2016-12-13 | 1 | -0/+36 |
| | | | | |||||
| | * | | Add tests for detailed build statuses factory | Grzegorz Bizon | 2016-12-13 | 1 | -0/+141 |
| | | | | |||||
| | * | | Make it possible to retry build that was canceled | Grzegorz Bizon | 2016-12-13 | 2 | -1/+9 |
| | | | | |||||
| | * | | Make build retryable only if complete and executed | Grzegorz Bizon | 2016-12-13 | 2 | -9/+32 |
| | | | | |||||
| | * | | Improve readability in methods for detailed status | Grzegorz Bizon | 2016-12-13 | 4 | -4/+12 |
| | | | | |||||
| | * | | Add tests for build cancelable/retryable statuses | Grzegorz Bizon | 2016-12-13 | 2 | -0/+172 |
| | | | | |||||
| | * | | Extend specs for build play/stop detailed statuses | Grzegorz Bizon | 2016-12-13 | 2 | -7/+55 |
| | | | | |||||
| | * | | Refine build stop/play extended status specs | Grzegorz Bizon | 2016-12-13 | 3 | -35/+35 |
| | | | | |||||
| | * | | Use manual build icon in play/stop build statuses | Grzegorz Bizon | 2016-12-13 | 3 | -6/+12 |
| | | | | |||||
| | * | | Adds manual action icon and case to show it | Filipa Lacerda | 2016-12-13 | 2 | -0/+3 |
| | | | | |||||
| | * | | Fix detailed status specs for pipeline stage model | Grzegorz Bizon | 2016-12-12 | 1 | -1/+3 |
| | | | | |||||
| | * | | Fix detailed status badge for generic commit status | Grzegorz Bizon | 2016-12-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | [ci skip] | ||||
| | * | | Fix pipeline specs for detailed statuses | Grzegorz Bizon | 2016-12-12 | 1 | -8/+12 |
| | | | | | | | | | | | | | [ci skip] | ||||
| | * | | Add specs for build stop extended detailed status | Grzegorz Bizon | 2016-12-12 | 2 | -4/+59 |
| | | | | |||||
| | * | | Add tests for build play extended detailed status | Grzegorz Bizon | 2016-12-12 | 2 | -3/+69 |
| | | | | |||||
| | * | | Fix build stop extended status CSS class | Grzegorz Bizon | 2016-12-12 | 1 | -4/+0 |
| | | | | |||||
| | * | | Fix path to build status details in common helpers | Grzegorz Bizon | 2016-12-12 | 1 | -1/+1 |
| | | | | |||||
| | * | | Improve detailed status badge partial | Grzegorz Bizon | 2016-12-12 | 8 | -18/+14 |
| | | | | |||||
| | * | | Revert some unneeded changes | Kamil Trzcinski | 2016-12-12 | 1 | -1/+1 |
| | | | | |||||
| | * | | Add action_class/action_title | Kamil Trzcinski | 2016-12-12 | 5 | -3/+30 |
| | | | | |||||
| | * | | Rename icon_with_label to icon_with_description | Kamil Trzcinski | 2016-12-12 | 8 | -8/+9 |
| | | | | |||||
| | * | | Fix auto loading of constants for Ci Statuses | Kamil Trzcinski | 2016-12-12 | 9 | -20/+21 |
| | | | | |||||
| | * | | Fix some detailed statuses specs related to abilities | Grzegorz Bizon | 2016-12-12 | 10 | -18/+49 |
| | | | | |||||
| | * | | Fix tests related to detailed statuses and permissions | Grzegorz Bizon | 2016-12-12 | 14 | -41/+45 |
| | | | | | | | | | | | | | [ci skip] | ||||
| | * | | Incorporate permission checks into new CI statuses | Grzegorz Bizon | 2016-12-12 | 11 | -49/+60 |
| | | | | | | | | | | | | | [ci skip] | ||||
| | * | | Refactor ci status factories to DRY code a little | Grzegorz Bizon | 2016-12-12 | 5 | -29/+28 |
| | | | | |||||
| | * | | Remove ci_status_with_icon helper and replace it with partial [ci skip] | Kamil Trzcinski | 2016-12-12 | 8 | -34/+17 |
| | | | | |||||
| | * | | Check permission of details | Kamil Trzcinski | 2016-12-12 | 4 | -7/+7 |
| | | | | |||||
| | * | | Introduce `cancelable` and `returnable` [ci skip] | Kamil Trzcinski | 2016-12-12 | 5 | -35/+64 |
| | | | | |||||
| | * | | Improve actions | Kamil Trzcinski | 2016-12-12 | 5 | -18/+110 |
| | | | | |||||
| | * | | Added Ci::Status::Build | Kamil Trzcinski | 2016-12-12 | 5 | -3/+84 |
| | | | | |||||
| * | | | Merge branch '25651-fix-master' into 'master' | Rémy Coutable | 2016-12-14 | 1 | -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-master | Rémy Coutable | 2016-12-14 | 1 | -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 Coutable | 2016-12-14 | 3 | -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-encoding | Yorick Peterse | 2016-12-13 | 3 | -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 | ||||
| * | | | | Merge branch '25136-last-deployment-link' into 'master' | Grzegorz Bizon | 2016-12-14 | 4 | -4/+46 |
| |\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken link for latest deployment ## What does this MR do? Creates a new helper for the latest deployment link. ## Why was this MR needed? A helper that returns a link was being called inside another helper that creates a link, resulting in `builds/<a href="builds/ID>#id</a>` ## What are the relevant issue numbers? Closes #25136 See merge request !7839 | ||||
| | * | | | Changes after review25136-last-deployment-link | Filipa Lacerda | 2016-12-07 | 3 | -24/+19 |
| | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |