| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'close-issue-by-implements' into 'master' | Sean McGivern | 2017-10-03 | 1 | -0/+40 |
| |\ | | | | | | | | | | | | | Add "implements" to the default issue closing message regex Closes #38424 See merge request gitlab-org/gitlab-ce!14612 | ||||
| | * | Add "implements" to the default issue closing message regex | Guilherme Vieira | 2017-10-02 | 1 | -0/+40 |
| | | | |||||
| * | | Merge branch 'ff_port_from_ee' into 'master' | Sean McGivern | 2017-10-03 | 1 | -0/+2 |
| |\ \ | | | | | | | | | | | | | Move Fast-Forward Merge to CE See merge request gitlab-org/gitlab-ce!14272 | ||||
| | * \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ff_port_from_ee | Valery Sizov | 2017-10-02 | 12 | -83/+318 |
| | |\ \ | |||||
| | * | | | Add merge_requests_rebase_enabled to json entities for specs | Valery Sizov | 2017-10-02 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Merge branch 'master' into ff_port_from_ee | Eric Eastwood | 2017-09-28 | 10 | -13/+680 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/models/project.rb db/schema.rb | ||||
| | * \ \ \ | Merge branch 'master' into ff_port_from_ee | Eric Eastwood | 2017-09-26 | 18 | -46/+361 |
| | |\ \ \ \ | |||||
| | * | | | | | Fast forward merge: basic implemenation[ci skip] | Valery Sizov | 2017-09-19 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Fix for Gitaly nil encoding issue | Andrew Newdigate | 2017-10-03 | 2 | -1/+15 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'gitaly-get-archive' into 'master' | Douwe Maan | 2017-10-03 | 1 | -1/+39 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send extra Gitaly params for `send_git_archive` if needed See merge request gitlab-org/gitlab-ce!14605 | ||||
| | * | | | | | | [ci skip] Fix archive spec descrptionsgitaly-get-archive | Alejandro Rodríguez | 2017-10-02 | 1 | -2/+2 |
| | | | | | | | | |||||
| | * | | | | | | Send extra Gitaly params for `send_git_archive` if needed | Alejandro Rodríguez | 2017-10-02 | 1 | -1/+39 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch '38635-fix-gitlab-check-git-ssh-config' into 'master' | Douwe Maan | 2017-10-03 | 1 | -1/+6 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whitelist authorized_keys.lock in the gitlab:check rake task Closes #38635 See merge request gitlab-org/gitlab-ce!14624 | ||||
| | * | | | | | | Whitelist authorized_keys.lock in the gitlab:check rake task | Nick Thomas | 2017-10-02 | 1 | -1/+6 |
| | | |_|_|/ / | |/| | | | | |||||
| * | | | | | | Merge branch '33493-attempt-to-link-saml-users-to-ldap-by-email' into 'master' | Douwe Maan | 2017-10-02 | 2 | -18/+96 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -58/+59 |
| | | | | | | | | |||||
| | * | | | | | | Attempt to link saml users to ldap by email | Tiago Botelho | 2017-09-25 | 1 | -0/+77 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'revert-configurable-size-limits' into 'master' | Douwe Maan | 2017-10-02 | 2 | -36/+5 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -36/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1d3c33b57eeb39df76e78fd37c86532c02aa22ac. | ||||
| * | | | | | | | | Fix 'gitlay' typo in spec | Jacob Vosmaer | 2017-10-02 | 1 | -1/+1 |
| | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | | Merge branch 'gitaly-add-branch' into 'master' | Sean McGivern | 2017-10-02 | 4 | -28/+105 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -0/+55 |
| | | | | | | | | |||||
| | * | | | | | | Populate `Gitlay::Repository`'s `gl_repository` field | Alejandro Rodríguez | 2017-09-30 | 2 | -1/+45 |
| | | | | | | | | |||||
| | * | | | | | | Add a factory for `Gitaly::GitCommit`s | Alejandro Rodríguez | 2017-09-30 | 1 | -27/+5 |
| | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | | Add username as GL_USERNAME in hooks (http) | David Turner | 2017-09-29 | 4 | -14/+28 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | | | Create repositories via Gitaly | Jacob Vosmaer | 2017-09-29 | 2 | -24/+33 |
| | | | | | | |||||
| * | | | | | Merge branch ↵ | Rémy Coutable | 2017-09-29 | 1 | -20/+102 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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 | -22/+76 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -2/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -0/+34 |
| | | | | | | | |||||
| * | | | | | | Fix notes type created from import | Lin Jen-Shin (godfat) | 2017-09-29 | 2 | -0/+18 |
| |/ / / / / | |||||
| * | | | | | Merge branch 'feature/migrate-repository-rm-tag-to-gitaly' into 'master' | Robert Speicher | 2017-09-28 | 1 | -1/+2 |
| |\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | Closes gitaly#562 | ||||
| * | | | | | Merge branch 'hashed-storage-migration-path' into 'master' | Douwe Maan | 2017-09-28 | 1 | -10/+31 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -10/+31 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | 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 | -0/+78 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | 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 'backstage/gb/refactor-pipeline-create-service' into 'master' | Kamil Trzciński | 2017-09-27 | 7 | -3/+537 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor a service responsible for creating a pipeline Closes #37563 and #34415 See merge request gitlab-org/gitlab-ce!14482 | ||||
| | * | | | | Add specs for pipeline chain builder sequence class | Grzegorz Bizon | 2017-09-26 | 1 | -0/+55 |
| | | | | | | |||||
| | * | | | | Fix some code style offenses in pipeline chain classes | Grzegorz Bizon | 2017-09-26 | 1 | -3/+2 |
| | | | | | | |||||
| | * | | | | Add missing tests for pipeline chain access validator | Grzegorz Bizon | 2017-09-26 | 1 | -0/+13 |
| | | | | | | |||||
| | * | | | | Add specs for pipeline builder that validates config | Grzegorz Bizon | 2017-09-26 | 1 | -0/+127 |
| | | | | | | |||||
| | * | | | | Add specs for pipeline builder repository validator | Grzegorz Bizon | 2017-09-26 | 1 | -0/+60 |
| | | | | | | |||||
| | * | | | | Add specs for builder chain that persist a pipeline | Grzegorz Bizon | 2017-09-26 | 1 | -0/+66 |
| | | | | | | |||||
| | * | | | | Add specs for builder chain step that skipps pipelines | Grzegorz Bizon | 2017-09-26 | 1 | -0/+85 |
| | | | | | | |||||
| | * | | | | Add specs for pipeline builder abilities validator | Grzegorz Bizon | 2017-09-26 | 1 | -10/+29 |
| | | | | | | |||||
| | * | | | | Move pipeline builder validation chain to a module | Grzegorz Bizon | 2017-09-26 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Split pipeline chain builder validation class | Grzegorz Bizon | 2017-09-26 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Extract pipeline chain builder classes from service | Grzegorz Bizon | 2017-09-25 | 1 | -0/+110 |
| | | | | | | |||||
| | * | | | | Move related pipeline class to new pipeline module | Grzegorz Bizon | 2017-09-25 | 1 | -3/+3 |
| | | | | | | |||||
| * | | | | | Add a spec for Github::Client and revert an `if !` to `unless`38198-fetch-github-api-per-100 | Rémy Coutable | 2017-09-26 | 1 | -0/+34 |
| | |_|_|/ |/| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |