summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Only add identities to a user if we find one in Gitlab::OAuth::User.38801-add-or-update-identities-should-only-work-if-gl-user-existsTiago Botelho2017-10-051-0/+2
* Merge branch 'use-simple-tmp-ref-path' into 'master'Sean McGivern2017-10-051-1/+1
|\
| * Use simple path for tmp ref, avoiding extra dirLin Jen-Shin2017-10-051-1/+1
* | Merge branch 'declarative-policy-optimisations' into 'master'Robert Speicher2017-10-052-19/+32
|\ \
| * | Speed up cached_pass? for composite rulesSean McGivern2017-10-051-8/+12
| * | Speed up DeclarativePolicy::Runner#steps_by_scoreSean McGivern2017-10-041-11/+20
* | | Remove 'Repo' prefix from API entitesVitaliy @blackst0ne Klachkov2017-10-0514-79/+78
| |/ |/|
* | Merge branch 'master' into 'master'Rémy Coutable2017-10-041-1/+1
|\ \
| * | Sidekiq::MemoryKiller: Add missing space in log messageBenjamin Drung2017-10-041-1/+1
| |/
* | Merge branch 'capture-rev-list-errors' into 'master'Sean McGivern2017-10-041-1/+1
|\ \
| * | Include RevList error messages in exceptionscapture-rev-list-errorsJacob Vosmaer2017-10-031-1/+1
* | | Merge branch 'gitaly-fetch-ref' into 'master'Sean McGivern2017-10-041-13/+52
|\ \ \
| * | | Let fetch_ref pull from Gitaly instead of from diskJacob Vosmaer2017-10-041-13/+52
| | |/ | |/|
* | | Merge branch 'missing-exception-variable' into 'master'Sean McGivern2017-10-041-1/+1
|\ \ \
| * | | Add missing exception variableJacob Vosmaer2017-10-041-1/+1
| |/ /
* | | 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
| | |/ / / / /
View Lorry Controller Status