summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bump gitaly-proto version to v0.39.0feature/bump-gitaly-proto-versionAhmad Sherif2017-10-022-2/+2
* Merge branch 'enhance-logging' into 'master'Robert Speicher2017-10-025-3/+28
|\
| * Remove lock reason and add guard clauseBrian Neel2017-09-292-2/+4
| * Standardize capitalization and statusBrian Neel2017-09-272-4/+4
| * Merge conflict resolutionBrian Neel2017-09-271-6/+6
| * # This is a combination of 1 commit.Brian Neel2017-09-275-3/+26
* | Merge branch 'sh-fix-import-repos' into 'master'Robert Speicher2017-10-025-3/+31
|\ \
| * | Fix gitlab-rake gitlab:import:repos taskStan Hu2017-10-025-3/+31
* | | Merge branch 'rd/fix-case-sensative-email-conf-signup' into 'master'Robert Speicher2017-10-023-1/+24
|\ \ \
| * | | Add new changelog entryrobdel122017-09-301-0/+5
| * | | Add `:email_confirmation` to devise `insensitive_keys`robdel122017-09-301-1/+1
| * | | Create failing test caserobdel122017-09-301-0/+18
* | | | Merge branch 'fix/gpg/case-insensitive' into 'master'Dmitriy Zaporozhets2017-10-023-1/+14
|\ \ \ \
| * | | | Make GPG validation case insensitive.Tim Bishop2017-09-293-1/+14
* | | | | 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-022-18/+19
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Make Redcarpet Markdown renderer thread-safeStan Hu2017-10-022-18/+19
| | |_|/ / | |/| | |
* | | | | Merge branch '33493-attempt-to-link-saml-users-to-ldap-by-email' into 'master'Douwe Maan2017-10-029-111/+173
|\ \ \ \ \
| * | | | | Refactors SAML identity creation in gl_user.Tiago Botelho2017-10-028-161/+122
| * | | | | Creates compound query for LDAP email attributes.Tiago Botelho2017-09-252-7/+15
| * | | | | Attempt to link saml users to ldap by emailTiago Botelho2017-09-255-8/+101
* | | | | | Merge branch 'revert-configurable-size-limits' into 'master'Douwe Maan2017-10-023-73/+14
|\ \ \ \ \ \
| * | | | | | Revert "Increase diff limits to 100 KB for collapse and 200 KB overall"Sean McGivern2017-10-023-73/+14
* | | | | | | Merge branch '38641-repo-editor-callout' into 'master'Jacob Schatz2017-10-021-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Removes auto devops callout from repo editor viewFilipa Lacerda2017-10-021-1/+1
* | | | | | | Merge branch 'gitaly-0.43.0' into 'master'Sean McGivern2017-10-021-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Use Gitaly 0.43.0Jacob Vosmaer2017-10-021-1/+1
* | | | | | | | Merge branch '38619-fix-comment-delete-confirm-text' into 'master'Filipa Lacerda2017-10-022-1/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix comment deletion confirmation dialog typoMark Fletcher2017-10-022-1/+6
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'fix-gitlay-typo' into 'master'Douwe Maan2017-10-021-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix 'gitlay' typo in specJacob Vosmaer2017-10-021-1/+1
* | | | | | | | | Merge branch 'translation-timeago-a-while-ago' into 'master'Douwe Maan2017-10-022-3/+3
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Fix translation for 'in a while'translation-timeago-a-while-agoKim "BKC" Carlbäcker2017-09-222-3/+3
* | | | | | | | | Merge branch 'sh-restore-all-refs-backup' into 'master'Sean McGivern2017-10-022-1/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Ensure all refs are restored on a restore from backupsh-restore-all-refs-backupStan Hu2017-09-292-1/+6
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'Update-description-accept-mr' into 'master'Sean McGivern2017-10-021-0/+4
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Update CONTRIBUTING.mdUpdate-description-accept-mrVictor Wu2017-09-291-0/+4
* | | | | | | | | Merge branch 'docs/add-changelog-lint' into 'master'Sean McGivern2017-10-021-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add changelog lint script to docs lint CI jobAchilleas Pipinellis2017-10-021-0/+1
* | | | | | | | | | Merge branch 'gitaly-add-branch' into 'master'Sean McGivern2017-10-0210-62/+231
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Implement OperationService.UserAddBranch Gitaly RPCgitaly-add-branchAlejandro Rodríguez2017-09-304-32/+152
| * | | | | | | | | Populate `Gitlay::Repository`'s `gl_repository` fieldAlejandro Rodríguez2017-09-304-3/+48
| * | | | | | | | | Add a factory for `Gitaly::GitCommit`sAlejandro Rodríguez2017-09-303-27/+31
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '34371-ca-vue' into 'master'Phil Hughes2017-10-027-35/+55
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Remove global componentsFilipa Lacerda2017-10-027-35/+55
|/ / / / / / / /
* | | | | | | | Merge branch '38571-fix-exception-in-raven-report' into 'master'Sean McGivern2017-10-023-3/+32
|\ \ \ \ \ \ \ \
| * | | | | | | | Ensure no exception is raised when Raven tries to get the current user in API...38571-fix-exception-in-raven-reportRémy Coutable2017-09-293-3/+32
* | | | | | | | | Merge branch '34366-issue-sidebar-don-t-render-participants-in-collapsed-stat...Tim Zallmann2017-10-029-70/+173
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | use LazyImageTagHelper.placeholder_image for blank src base64 image34366-issue-sidebar-don-t-render-participants-in-collapsed-stateLuke "Jared" Bennett2017-10-011-1/+1