Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update used version of Runner Helm Chart to 0.1.38 | Tomasz Maczukin | 2018-11-22 | 1 | -3/+3 |
| | |||||
* | Merge branch 'revert-fd6e3781' into 'master' | Sean McGivern | 2018-11-22 | 4 | -582/+382 |
|\ | | | | | | | | | | | | | Revert "Merge branch 'revert-e2aa2177' into 'master'" Closes #54267 See merge request gitlab-org/gitlab-ce!23237 | ||||
| * | Revert "Merge branch 'revert-e2aa2177' into 'master'" | Zeger-Jan van de Weg | 2018-11-20 | 4 | -582/+382 |
| | | | | | | This reverts merge request !23229 | ||||
* | | Eliminate duplicated words | Takuya Noguchi | 2018-11-22 | 2 | -4/+4 |
| | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com> | ||||
* | | Merge branch '49565-ssh-push-mirroring' into 'master' | Robert Speicher | 2018-11-20 | 1 | -1/+13 |
|\ \ | |/ |/| | | | | | | | | | SSH public-key authentication for push mirroring Closes #49565 See merge request gitlab-org/gitlab-ce!22982 | ||||
| * | SSH public-key authentication for push mirroring | Nick Thomas | 2018-11-19 | 1 | -1/+13 |
| | | |||||
* | | Merge branch 'revert-e2aa2177' into 'master' | Sean McGivern | 2018-11-20 | 4 | -382/+582 |
|\ \ | | | | | | | | | | | | | Revert "Merge branch 'zj-improve-gitaly-pb' into 'master'" See merge request gitlab-org/gitlab-ce!23229 | ||||
| * | | Revert "Merge branch 'zj-improve-gitaly-pb' into 'master'"revert-e2aa2177 | Sean McGivern | 2018-11-20 | 4 | -382/+582 |
| | | | | | | | | | This reverts merge request !23140 | ||||
* | | | Merge branch '3062-improve-project-cache' into 'master' | Douwe Maan | 2018-11-20 | 1 | -0/+18 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | Change project cache key to depend on ID instead of full path Closes #42191 See merge request gitlab-org/gitlab-ce!23135 | ||||
| * | | Add `wiki` extra namespace when repository is_wiki: true3062-improve-project-cache | Gabriel Mazetto | 2018-11-16 | 1 | -0/+18 |
| | | | |||||
* | | | Merge branch 'zj-improve-gitaly-pb' into 'master' | Sean McGivern | 2018-11-20 | 4 | -582/+382 |
|\ \ \ | | | | | | | | | | | | | | | | | Show what RPC is called in the performance bar See merge request gitlab-org/gitlab-ce!23140 | ||||
| * | | | Remove duplicate tests for Gitaly | Zeger-Jan van de Weg | 2018-11-19 | 4 | -582/+382 |
| | | | | | | | | | | | | | | | | | | | | The disabling of Gitaly was basically stubbing `Feature.enabled?` call, which was never triggered. | ||||
* | | | | Merge branch 'rails5-active-record-class-value' into 'master' | Stan Hu | 2018-11-19 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Rails5 deprecation: Passing a class as a value in an Active Record query is deprecated See merge request gitlab-org/gitlab-ce!23164 | ||||
| * | | | | Rails5: Passing a class as a value in an Active Record query is deprecated | Jasper Maes | 2018-11-17 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch '54046-fix-by-any-email-for-private-commit-emails' into 'master' | Douwe Maan | 2018-11-19 | 2 | -3/+58 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Match users better by their private commit email Closes #54046 See merge request gitlab-org/gitlab-ce!23080 | ||||
| * | | | | Match users better by their private commit email | Nick Thomas | 2018-11-19 | 2 | -3/+58 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | Private commit emails were introduced in !22560, but some parts of GitLab were not updated to take account of them. This commit adds support in places that were missed. | ||||
* | | | | Merge branch 'improve-variables-support' into 'master' | Sean McGivern | 2018-11-19 | 2 | -179/+192 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Improve variables support See merge request gitlab-org/gitlab-ce!23077 | ||||
| * | | | | Improve variables supportimprove-variables-support | Kamil Trzciński | 2018-11-19 | 2 | -179/+192 |
| | |/ / | |/| | | | | | | | | | | | | | | | | | | This ensures that variables accept only string, alongside also improves kubernetes_namespace, improving validation and default value being set. | ||||
* | | | | Add support for surfacing a link to the branch or tag name in push message… | Tony Castrogiovanni | 2018-11-19 | 1 | -12/+53 |
| |/ / |/| | | |||||
* | | | Merge branch '53700-hashed-storagemigration' into 'master' | Stan Hu | 2018-11-16 | 1 | -0/+8 |
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | Hashed Storage: allow migration to be retried in partially migrated projects Closes #53700 See merge request gitlab-org/gitlab-ce!23087 | ||||
| * | | Allow partially migrated repositories to continue migration53700-hashed-storagemigration | Gabriel Mazetto | 2018-11-15 | 1 | -0/+8 |
| |/ | | | | | | | | | | | | | | | | | Previously we verified if the projecthave at least migrated their repository to hashed storage and prevented the migration command to start a new migration. The new version checks for the latest storage version available (fully migrated), otherwise it allows migration to be triggered again. | ||||
* | | Merge branch '49726-upgrade-helm-to-2-11' into 'master' | Kamil Trzciński | 2018-11-16 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | Resolve "Upgrade Helm Tiller Version Used By GitLab Managed Apps" Closes #49726 See merge request gitlab-org/gitlab-ce!22693 | ||||
| * | | Upgrade helm to 2.11.0 and upgrade on every install | Dylan Griffith | 2018-11-16 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch '28682-can-merge-branch-before-build-is-started' into 'master' | Grzegorz Bizon | 2018-11-16 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | Resolve "Can merge branch before build is started" Closes #28682 See merge request gitlab-org/gitlab-ce!22911 | ||||
| * | | Strictly require a pipeline to merge | Matija Čupić | 2018-11-08 | 1 | -1/+1 |
| | | | |||||
* | | | Ignore environment validation failure | Shinya Maeda | 2018-11-15 | 1 | -0/+21 |
| | | | |||||
* | | | Don't care about order when getting awarded issues | Toon Claes | 2018-11-15 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | Fixing failing master: https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/116776474 | ||||
* | | | Fix deployment jobs using nil token | Thong Kuah | 2018-11-13 | 3 | -2/+56 |
| | | | |||||
* | | | Fix MergeRequestService erroring out on deleted branch | Stan Hu | 2018-11-12 | 1 | -0/+4 |
| |/ |/| | | | | | | | | | | | | | When a branch is deleted, the push commit IDs is an empty array. The previous change would attempt to call `[].exists?`, which is invalid. Fix this by returning `MergeRequestDiffCommit.none` instead. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53853 | ||||
* | | Merge branch 'blackst0ne-add-discord-service' into 'master' | Sean McGivern | 2018-11-12 | 3 | -242/+19 |
|\ \ | | | | | | | | | | | | | | | | | | | Add Discord integration Closes #21635 See merge request gitlab-org/gitlab-ce!22684 | ||||
| * | | Fix minor offensesblackst0ne-add-discord-service | blackst0ne | 2018-11-10 | 1 | -1/+1 |
| | | | |||||
| * | | Refactor specs | blackst0ne | 2018-11-07 | 2 | -460/+11 |
| | | | |||||
| * | | DRY specs, fix typos in docs | blackst0ne | 2018-11-06 | 2 | -43/+24 |
| | | | |||||
| * | | Fix frozen strings | blackst0ne | 2018-11-05 | 1 | -0/+2 |
| | | | |||||
| * | | Add spec for DiscordService | blackst0ne | 2018-11-05 | 1 | -0/+242 |
| | | | |||||
| * | | Add Discord integration | blackst0ne | 2018-10-30 | 1 | -0/+1 |
| | | | |||||
* | | | Merge branch '34758-group-cluster-controller' into 'master' | Kamil Trzciński | 2018-11-09 | 2 | -0/+34 |
|\ \ \ | | | | | | | | | | | | | | | | | User can create a group level cluster and install applications See merge request gitlab-org/gitlab-ce!22450 | ||||
| * | | | Consolidate how we allow user defined namespace | Thong Kuah | 2018-11-08 | 1 | -0/+22 |
| | | | | | | | | | | | | | | | | | | | | Use model method as single source of truth instead of splitting between presenter and Kubernetes model | ||||
| * | | | Only project clusters has Project Namespace field | Thong Kuah | 2018-11-08 | 1 | -0/+12 |
| | |/ | |/| | | | | | | | | | | Group clusters should not allow Project Namespace so don't show that field input too | ||||
* | | | Revert "Extract code into IssueBoardEntity"revert_issue_board_entity | Thong Kuah | 2018-11-09 | 1 | -2/+2 |
|/ / | | | | | | | This reverts commit 8c126525faba40032244328187ba73a53b6eaf4c. | ||||
* | | Merge branch 'max_retries_when' into 'master' | Grzegorz Bizon | 2018-11-07 | 1 | -5/+103 |
|\ \ | | | | | | | | | | | | | | | | | | | Allow to configure when to retry builds Closes gitlab-runner#3515 See merge request gitlab-org/gitlab-ce!21758 | ||||
| * | | handle old retry format in build (possibly saved in database) | Markus Doits | 2018-11-07 | 1 | -0/+16 |
| | | | |||||
| * | | refactoring after latest feedback | Markus Doits | 2018-11-07 | 1 | -41/+9 |
| | | | |||||
| * | | fix some spec wording and values | Markus Doits | 2018-11-07 | 1 | -5/+5 |
| | | | |||||
| * | | refactor retry logic to define any reason and more than one reason to retry | Markus Doits | 2018-11-07 | 1 | -101/+23 |
| | | | |||||
| * | | add `retry_failure?` option and use it to decide if to retry a build failure | Markus Doits | 2018-11-07 | 1 | -0/+150 |
| | | | |||||
| * | | add an option when to retry a build (unused yet) | Markus Doits | 2018-11-07 | 1 | -0/+26 |
| | | | |||||
| * | | allow retries to be a hash | Markus Doits | 2018-11-07 | 1 | -1/+17 |
| | | | | | | | | | | | | | | | - when it is a hash, retries max count is assumed to be at hash[:max] - when it is an integer, this is the max count (as before) | ||||
* | | | Merge branch 'triggermesh-phase1-knative' into 'master' | Grzegorz Bizon | 2018-11-07 | 6 | -93/+83 |
|\ \ \ | | | | | | | | | | | | | | | | | Allow to install Knative as cluster application See merge request gitlab-org/gitlab-ce!22593 | ||||
| * | | | Fix style with clusters_store.js and remove workaround for namespace role issuetriggermesh/dgriffith/gitlab-ce-triggermesh-phase1-knative | Chris Baumbauer | 2018-11-06 | 1 | -0/+4 |
| | | | |