Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'capture-rev-list-errors' into 'master' | Sean McGivern | 2017-10-04 | 1 | -1/+1 |
|\ | |||||
| * | Include RevList error messages in exceptionscapture-rev-list-errors | Jacob Vosmaer | 2017-10-03 | 1 | -1/+1 |
* | | Merge branch 'gitaly-fetch-ref' into 'master' | Sean McGivern | 2017-10-04 | 1 | -13/+52 |
|\ \ | |||||
| * | | Let fetch_ref pull from Gitaly instead of from disk | Jacob Vosmaer | 2017-10-04 | 1 | -13/+52 |
* | | | Merge branch 'missing-exception-variable' into 'master' | Sean McGivern | 2017-10-04 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Add missing exception variable | Jacob Vosmaer | 2017-10-04 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge branch 'merge-request-notes-performance' into 'master' | Sean McGivern | 2017-10-04 | 1 | -2/+7 |
|\ \ \ | |||||
| * | | | Use a UNION ALL for getting merge request notesmerge-request-notes-performance | Yorick Peterse | 2017-10-02 | 1 | -2/+7 |
* | | | | Load only the currently needed JS locale file | Tim Zallmann | 2017-10-04 | 1 | -1/+1 |
| |/ / |/| | | |||||
* | | | Merge branch 'gitaly-delete-branch' into 'master' | Douwe Maan | 2017-10-04 | 2 | -1/+21 |
|\ \ \ | |||||
| * | | | Add OperationService.UserDeleteBranch Gitaly RPCgitaly-delete-branch | Alejandro Rodríguez | 2017-10-03 | 2 | -1/+21 |
* | | | | Merge branch '37970-timestamped-ci' into 'master' | Kamil Trzciński | 2017-10-03 | 2 | -1/+13 |
|\ \ \ \ | |||||
| * | | | | Expose GitLab features to the CI runner37970-timestamped-ci | Alessio Caiazza | 2017-10-03 | 1 | -0/+1 |
| * | | | | Hide CI section markers from job trace | Alessio Caiazza | 2017-10-03 | 1 | -1/+12 |
* | | | | | Hide Gollum inside Gitlab::Git::Wiki | Jacob Vosmaer (GitLab) | 2017-10-03 | 4 | -0/+192 |
* | | | | | Restore User.from_gitaly | Jacob Vosmaer (GitLab) | 2017-10-03 | 1 | -0/+5 |
* | | | | | Merge remote-tracking branch 'upstream/master' into gem/sm/bump-google-api-cl... | Lin Jen-Shin | 2017-10-03 | 39 | -286/+661 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | 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.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 | Alejandro Rodríguez | 2017-10-02 | 1 | -0/+7 |
| | | |_|/ / | | |/| | | | |||||
| * | | | | | Merge branch '38635-fix-gitlab-check-git-ssh-config' into 'master' | Douwe Maan | 2017-10-03 | 1 | -0/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | Whitelist authorized_keys.lock in the gitlab:check rake task | Nick Thomas | 2017-10-02 | 1 | -0/+1 |
| * | | | | | | Merge branch 'sh-fix-import-repos' into 'master' | Robert Speicher | 2017-10-02 | 1 | -1/+2 |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| | * | | | | | Fix gitlab-rake gitlab:import:repos task | Stan Hu | 2017-10-02 | 1 | -1/+2 |
| | | |/ / / | | |/| | | | |||||
| * | | | | | Merge branch 'log-update-ref-errors' into 'master' | Sean McGivern | 2017-10-02 | 1 | -1/+3 |
| |\ \ \ \ \ | |||||
| | * | | | | | Log update-ref errors in OperationService | Jacob Vosmaer | 2017-10-02 | 1 | -1/+3 |
| * | | | | | | Merge branch 'sh-thread-safe-markdown' into 'master' | Robert Speicher | 2017-10-02 | 1 | -18/+14 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| | * | | | | | Make Redcarpet Markdown renderer thread-safe | Stan Hu | 2017-10-02 | 1 | -18/+14 |
| * | | | | | | Merge branch '33493-attempt-to-link-saml-users-to-ldap-by-email' into 'master' | Douwe Maan | 2017-10-02 | 5 | -92/+67 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | 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" | Sean McGivern | 2017-10-02 | 1 | -37/+9 |
| * | | | | | | | Merge branch 'sh-restore-all-refs-backup' into 'master' | Sean McGivern | 2017-10-02 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| | * | | | | | | Ensure all refs are restored on a restore from backupsh-restore-all-refs-backup | Stan Hu | 2017-09-29 | 1 | -1/+1 |
| * | | | | | | | Merge branch 'gitaly-add-branch' into 'master' | Sean McGivern | 2017-10-02 | 3 | -9/+50 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| | * | | | | | | 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 '38571-fix-exception-in-raven-report' into 'master' | Sean McGivern | 2017-10-02 | 1 | -3/+5 |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| | * | | | | | Ensure no exception is raised when Raven tries to get the current user in API...38571-fix-exception-in-raven-report | Rémy Coutable | 2017-09-29 | 1 | -3/+5 |
| * | | | | | | Merge branch 'remote_user' into 'master' | Douwe Maan | 2017-10-02 | 5 | -22/+32 |
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| | * | | | | | add username to authorized result, so that gitlab-shell can pass it to hooks | David Turner | 2017-09-29 | 3 | -7/+13 |
| | * | | | | | Add username as GL_USERNAME in hooks (http) | David Turner | 2017-09-29 | 3 | -17/+25 |
| | * | | | | | 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 | 4 | -8/+22 |
| |/ / / | |||||
| * | | | Merge branch '36631-activerecord-statementinvalid-pg-querycanceled-error-canc... | Rémy Coutable | 2017-09-29 | 1 | -5/+27 |
| |\ \ \ |