Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Include RevList error messages in exceptionscapture-rev-list-errors | Jacob Vosmaer | 2017-10-03 | 1 | -1/+1 |
| | |||||
* | Merge branch 'fix-kubectl-180' into 'master' | Kamil Trzciński | 2017-10-03 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | Fix broken certificate-authority-data with kubectl >= 1.8.0 Closes #38685 See merge request gitlab-org/gitlab-ce!14635 | ||||
| * | Fix broken certificate-authority-data with kubectl >= 1.8.0fix-kubectl-180 | Alessio Caiazza | 2017-10-03 | 1 | -1/+1 |
| | | |||||
* | | Fix for Gitaly nil encoding issue | Andrew Newdigate | 2017-10-03 | 2 | -1/+3 |
| | | |||||
* | | Merge branch 'gitaly-get-archive' into 'master' | Douwe Maan | 2017-10-03 | 1 | -0/+7 |
|\ \ | | | | | | | | | | | | | Send extra Gitaly params for `send_git_archive` if needed See merge request gitlab-org/gitlab-ce!14605 | ||||
| * | | Send extra Gitaly params for `send_git_archive` if needed | Alejandro Rodríguez | 2017-10-02 | 1 | -0/+7 |
| | | | |||||
* | | | Merge branch 'sh-fix-import-repos' into 'master' | Robert Speicher | 2017-10-02 | 1 | -1/+2 |
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | Fix gitlab-rake gitlab:import:repos task Closes #37682 See merge request gitlab-org/gitlab-ce!14597 | ||||
| * | | Fix gitlab-rake gitlab:import:repos task | Stan Hu | 2017-10-02 | 1 | -1/+2 |
| |/ | | | | | | | | | | | | | | | | | | | | | Because of a change in GitLab 9.5.4 to prevent users from assuming control of a repository already on disk, the import task broke. Imports would fail with the message, "There is already a repository with that name on disk". This change skips the validation when the import is done from the command-line. Closes #37682 | ||||
* | | Merge branch 'log-update-ref-errors' into 'master' | Sean McGivern | 2017-10-02 | 1 | -1/+3 |
|\ \ | |/ |/| | | | | | Log update-ref errors in OperationService See merge request gitlab-org/gitlab-ce!14627 | ||||
| * | Log update-ref errors in OperationService | Jacob Vosmaer | 2017-10-02 | 1 | -1/+3 |
| | | |||||
* | | Merge branch '33493-attempt-to-link-saml-users-to-ldap-by-email' into 'master' | Douwe Maan | 2017-10-02 | 5 | -92/+67 |
|\ \ | | | | | | | | | | | | | | | | | | | Attempt to link saml users to ldap by email Closes #33493 See merge request gitlab-org/gitlab-ce!14216 | ||||
| * | | Refactors SAML identity creation in gl_user. | Tiago Botelho | 2017-10-02 | 5 | -102/+58 |
| | | | |||||
| * | | Creates compound query for LDAP email attributes. | Tiago Botelho | 2017-09-25 | 2 | -7/+15 |
| | | | |||||
| * | | Attempt to link saml users to ldap by email | Tiago Botelho | 2017-09-25 | 3 | -8/+19 |
| | | | |||||
* | | | Merge branch 'revert-configurable-size-limits' into 'master' | Douwe Maan | 2017-10-02 | 1 | -37/+9 |
|\ \ \ | |_|/ |/| | | | | | | | | Revert "Increase diff limits to 100 KB for collapse and 200 KB overall" See merge request gitlab-org/gitlab-ce!14628 | ||||
| * | | Revert "Increase diff limits to 100 KB for collapse and 200 KB overall" | Sean McGivern | 2017-10-02 | 1 | -37/+9 |
| | | | | | | | | | | | | This reverts commit 1d3c33b57eeb39df76e78fd37c86532c02aa22ac. | ||||
* | | | Merge branch 'gitaly-add-branch' into 'master' | Sean McGivern | 2017-10-02 | 3 | -9/+50 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | Implement OperationService.UserAddBranch Gitaly RPC Closes gitaly#544 See merge request gitlab-org/gitlab-ce!14522 | ||||
| * | | Implement OperationService.UserAddBranch Gitaly RPCgitaly-add-branch | Alejandro Rodríguez | 2017-09-30 | 2 | -7/+47 |
| | | | |||||
| * | | Populate `Gitlay::Repository`'s `gl_repository` field | Alejandro Rodríguez | 2017-09-30 | 2 | -2/+3 |
| | | | |||||
* | | | Merge branch 'remote_user' into 'master' | Douwe Maan | 2017-10-02 | 4 | -22/+25 |
|\ \ \ | | | | | | | | | | | | | | | | | Add GL_USERNAME environment variable for hooks See merge request gitlab-org/gitlab-ce!13264 | ||||
| * | | | add username to authorized result, so that gitlab-shell can pass it to hooks | David Turner | 2017-09-29 | 2 | -7/+6 |
| | | | | |||||
| * | | | Add username as GL_USERNAME in hooks (http) | David Turner | 2017-09-29 | 3 | -17/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling pre-receive, post-receive, and update hooks, add the GitLab username as the GL_USERNAME environment variable. This patch only handles cases where pushes are over http, or via the web interface. Later, we will address the ssh case. | ||||
| * | | | remove unused from_gitaly method | David Turner | 2017-09-29 | 1 | -4/+0 |
| |/ / | |||||
* | | | Add environment variable to bypass n+1 | Andrew Newdigate | 2017-09-30 | 1 | -1/+1 |
|/ / | |||||
* | | Create repositories via Gitaly | Jacob Vosmaer | 2017-09-29 | 3 | -7/+21 |
| | | |||||
* | | Merge branch ↵ | Rémy Coutable | 2017-09-29 | 1 | -5/+27 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | '36631-activerecord-statementinvalid-pg-querycanceled-error-canceling-statement-due-to-statement-timeout' into 'master' Insert at most 1,000 rows at once in MR diff background migration Closes #36631 et #37505 See merge request gitlab-org/gitlab-ce!13661 | ||||
| * | | Make MR diff background migration less likely to time out | Sean McGivern | 2017-09-29 | 1 | -9/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This version does not use transactions, but individual statements. As we have unique constraints on the target tables for the inserts, we can just ignore uniqueness violations there (as long as we always insert the same batch size, in the same order). This means the spec now must use truncation, not a transaction, as the uniqueness violation means that the whole transaction for that spec would be invalid, which isn't what we'd want. In real-world use, this isn't run in a transaction anyway. This commit also wraps unhandled exceptions, for easier finding in Sentry, and logs with a consistent format, for easier searching. | ||||
| * | | Insert at most 1,000 rows at once in MR diff background migration | Sean McGivern | 2017-09-29 | 1 | -3/+9 |
| | | | | | | | | | | | | | | | | | | We were hitting the statement timeout for very large MR diffs. Now we insert at most 1,000 rows to `merge_request_diff_commits` in a single statement, or 100 rows to `merge_request_diff_files`. | ||||
* | | | Make Repository#has_visible_content more efficient | Jacob Vosmaer (GitLab) | 2017-09-29 | 2 | -1/+33 |
|/ / | |||||
* | | Migrate Gitlab::Git::Repository#add_tag to Gitalyfeature/migrate-repository-add-tag-to-gitaly | Ahmad Sherif | 2017-09-29 | 4 | -30/+70 |
| | | | | | | | | Closes gitaly#601 | ||||
* | | Merge branch 'feature/migrate-repository-rm-tag-to-gitaly' into 'master' | Robert Speicher | 2017-09-28 | 3 | -1/+45 |
|\ \ | | | | | | | | | | | | | | | | | | | Migrate Git::Repository#rm_tag to Gitaly Closes gitaly#562 See merge request gitlab-org/gitlab-ce!14388 | ||||
| * | | Migrate Git::Repository#rm_tag to Gitaly | Ahmad Sherif | 2017-09-28 | 3 | -1/+45 |
| | | | | | | | | | | | | Closes gitaly#562 | ||||
* | | | Merge branch 'hashed-storage-migration-path' into 'master' | Douwe Maan | 2017-09-28 | 1 | -1/+6 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Hashed storage migration path Closes gitlab-ee#3118 See merge request gitlab-org/gitlab-ce!14067 | ||||
| * | | | [Backported from EE] Readonly flag for Projects | Gabriel Mazetto | 2017-09-28 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | This is used in EE for the storage migration, and we want to use this in CE as well to be able to migrate projects to hashed_storage. | ||||
* | | | | Handle error when fetching ref for MR with deleted source branch38319-nomethoderror-undefined-method-sha-for-nil-nilclass | Sean McGivern | 2017-09-28 | 1 | -2/+7 |
|/ / / | | | | | | | | | | | | | | | | If the ref doesn't exist, and the source branch is deleted, we can't get it back easily. Previously, we ignored this error by shelling out, so replicate that behaviour. | ||||
* | | | Merge branch 'zj-repo-gitaly' into 'master' | Sean McGivern | 2017-09-28 | 1 | -2/+12 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | RepositoryExists is always called with #gitaly_migration Closes #38333 See merge request gitlab-org/gitlab-ce!14513 | ||||
| * | | | Rolling back change to n+1 detectionan-repo-gitaly | Andrew Newdigate | 2017-09-27 | 1 | -7/+1 |
| | | | | |||||
| * | | | RepositoryExists is always called with #gitaly_migration | Zeger-Jan van de Weg | 2017-09-26 | 1 | -2/+12 |
| | | | | |||||
| * | | | Don't enforce gitaly request limits for distinct calls | Alejandro Rodríguez | 2017-09-26 | 1 | -1/+7 |
| | | | | |||||
* | | | | refactor users update service | James Lopez | 2017-09-28 | 2 | -2/+2 |
| | | | | |||||
* | | | | refactor services to match EE signature | James Lopez | 2017-09-28 | 2 | -2/+2 |
| |/ / |/| | | |||||
* | | | Merge branch 'backstage/gb/refactor-pipeline-create-service' into 'master' | Kamil Trzciński | 2017-09-27 | 10 | -141/+412 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | Refactor a service responsible for creating a pipeline Closes #37563 and #34415 See merge request gitlab-org/gitlab-ce!14482 | ||||
| * | | Add some minor improvements to pipeline creation chainbackstage/gb/refactor-pipeline-create-service | Grzegorz Bizon | 2017-09-27 | 2 | -5/+2 |
| | | | |||||
| * | | Add specs for builder chain step that skipps pipelines | Grzegorz Bizon | 2017-09-26 | 1 | -1/+1 |
| | | | |||||
| * | | Fix coding style offenses in pipeline chain classes | Grzegorz Bizon | 2017-09-26 | 2 | -4/+2 |
| | | | |||||
| * | | Move pipeline builder validation chain to a module | Grzegorz Bizon | 2017-09-26 | 6 | -115/+121 |
| | | | |||||
| * | | Split pipeline chain builder validation class | Grzegorz Bizon | 2017-09-26 | 6 | -102/+143 |
| | | | |||||
| * | | Add class that handles pipeline creation sequence | Grzegorz Bizon | 2017-09-26 | 1 | -0/+37 |
| | | | |||||
| * | | Extract pipeline persistence to a separate chain class | Grzegorz Bizon | 2017-09-26 | 1 | -0/+29 |
| | | | |||||
| * | | Fix code style offenses in pipeline create services | Grzegorz Bizon | 2017-09-26 | 1 | -1/+1 |
| | | |