summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'merge-request-notes-performance' into 'master'Sean McGivern2017-10-041-2/+7
|\
| * Use a UNION ALL for getting merge request notesmerge-request-notes-performanceYorick Peterse2017-10-021-2/+7
* | Load only the currently needed JS locale fileTim Zallmann2017-10-041-1/+1
* | Merge branch 'gitaly-delete-branch' into 'master'Douwe Maan2017-10-042-1/+21
|\ \
| * | Add OperationService.UserDeleteBranch Gitaly RPCgitaly-delete-branchAlejandro Rodríguez2017-10-032-1/+21
* | | Merge branch '37970-timestamped-ci' into 'master'Kamil Trzciński2017-10-032-1/+13
|\ \ \
| * | | Expose GitLab features to the CI runner37970-timestamped-ciAlessio Caiazza2017-10-031-0/+1
| * | | Hide CI section markers from job traceAlessio Caiazza2017-10-031-1/+12
* | | | Hide Gollum inside Gitlab::Git::WikiJacob Vosmaer (GitLab)2017-10-034-0/+192
* | | | Restore User.from_gitalyJacob Vosmaer (GitLab)2017-10-031-0/+5
* | | | Merge remote-tracking branch 'upstream/master' into gem/sm/bump-google-api-cl...Lin Jen-Shin2017-10-0339-286/+661
|\ \ \ \
| * \ \ \ Merge branch 'fix-kubectl-180' into 'master'Kamil Trzciński2017-10-031-1/+1
| |\ \ \ \
| | * | | | Fix broken certificate-authority-data with kubectl >= 1.8.0fix-kubectl-180Alessio Caiazza2017-10-031-1/+1
| * | | | | Fix for Gitaly nil encoding issueAndrew Newdigate2017-10-032-1/+3
| * | | | | Merge branch 'gitaly-get-archive' into 'master'Douwe Maan2017-10-031-0/+7
| |\ \ \ \ \
| | * | | | | Send extra Gitaly params for `send_git_archive` if neededAlejandro Rodríguez2017-10-021-0/+7
| | | |_|/ / | | |/| | |
| * | | | | Merge branch '38635-fix-gitlab-check-git-ssh-config' into 'master'Douwe Maan2017-10-031-0/+1
| |\ \ \ \ \
| | * | | | | Whitelist authorized_keys.lock in the gitlab:check rake taskNick Thomas2017-10-021-0/+1
| * | | | | | Merge branch 'sh-fix-import-repos' into 'master'Robert Speicher2017-10-021-1/+2
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Fix gitlab-rake gitlab:import:repos taskStan Hu2017-10-021-1/+2
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'log-update-ref-errors' into 'master'Sean McGivern2017-10-021-1/+3
| |\ \ \ \ \
| | * | | | | Log update-ref errors in OperationServiceJacob Vosmaer2017-10-021-1/+3
| * | | | | | Merge branch 'sh-thread-safe-markdown' into 'master'Robert Speicher2017-10-021-18/+14
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Make Redcarpet Markdown renderer thread-safeStan Hu2017-10-021-18/+14
| * | | | | | Merge branch '33493-attempt-to-link-saml-users-to-ldap-by-email' into 'master'Douwe Maan2017-10-025-92/+67
| |\ \ \ \ \ \
| | * | | | | | Refactors SAML identity creation in gl_user.Tiago Botelho2017-10-025-102/+58
| | * | | | | | Creates compound query for LDAP email attributes.Tiago Botelho2017-09-252-7/+15
| | * | | | | | Attempt to link saml users to ldap by emailTiago Botelho2017-09-253-8/+19
| * | | | | | | Merge branch 'revert-configurable-size-limits' into 'master'Douwe Maan2017-10-021-37/+9
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Revert "Increase diff limits to 100 KB for collapse and 200 KB overall"Sean McGivern2017-10-021-37/+9
| * | | | | | | Merge branch 'sh-restore-all-refs-backup' into 'master'Sean McGivern2017-10-021-1/+1
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Ensure all refs are restored on a restore from backupsh-restore-all-refs-backupStan Hu2017-09-291-1/+1
| * | | | | | | Merge branch 'gitaly-add-branch' into 'master'Sean McGivern2017-10-023-9/+50
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Implement OperationService.UserAddBranch Gitaly RPCgitaly-add-branchAlejandro Rodríguez2017-09-302-7/+47
| | * | | | | | Populate `Gitlay::Repository`'s `gl_repository` fieldAlejandro Rodríguez2017-09-302-2/+3
| | |/ / / / /
| * | | | | | Merge branch '38571-fix-exception-in-raven-report' into 'master'Sean McGivern2017-10-021-3/+5
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Ensure no exception is raised when Raven tries to get the current user in API...38571-fix-exception-in-raven-reportRémy Coutable2017-09-291-3/+5
| * | | | | | Merge branch 'remote_user' into 'master'Douwe Maan2017-10-025-22/+32
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | add username to authorized result, so that gitlab-shell can pass it to hooksDavid Turner2017-09-293-7/+13
| | * | | | | Add username as GL_USERNAME in hooks (http)David Turner2017-09-293-17/+25
| | * | | | | remove unused from_gitaly methodDavid Turner2017-09-291-4/+0
| | | |/ / / | | |/| | |
| * | | | | Add environment variable to bypass n+1Andrew Newdigate2017-09-301-1/+1
| |/ / / /
| * | | | Create repositories via GitalyJacob Vosmaer2017-09-294-8/+22
| |/ / /
| * | | Merge branch '36631-activerecord-statementinvalid-pg-querycanceled-error-canc...Rémy Coutable2017-09-291-5/+27
| |\ \ \
| | * | | Make MR diff background migration less likely to time outSean McGivern2017-09-291-9/+25
| | * | | Insert at most 1,000 rows at once in MR diff background migrationSean McGivern2017-09-291-3/+9
| * | | | Make Repository#has_visible_content more efficientJacob Vosmaer (GitLab)2017-09-292-1/+33
| * | | | Fix notes type created from importLin Jen-Shin (godfat)2017-09-295-37/+55
| |/ / /
| * | | Migrate Gitlab::Git::Repository#add_tag to Gitalyfeature/migrate-repository-add-tag-to-gitalyAhmad Sherif2017-09-294-30/+70
| * | | Merge branch 'feature/migrate-repository-rm-tag-to-gitaly' into 'master'Robert Speicher2017-09-283-1/+45
| |\ \ \
View Lorry Controller Status