summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'feature/migrate-find-wiki-page-to-gitaly' into 'master'Sean McGivern2017-10-313-7/+82
|\
| * Migrate Gitlab::Git::Wiki#page to Gitalyfeature/migrate-find-wiki-page-to-gitalyAhmad Sherif2017-10-313-7/+82
* | Merge branch 'dm-ldap-identity-normalize-dn' into 'master'Sean McGivern2017-10-312-3/+4
|\ \
| * | Normalize LDAP DN when looking up identityDouwe Maan2017-10-312-3/+4
* | | Merge branch 'zj/gitlab-ce-zj-ruby-2.3.5' into 'master'Sean McGivern2017-10-311-1/+1
|\ \ \
| * | | Upgrade Ruby to 2.3.5Zeger-Jan van de Weg2017-10-311-1/+1
* | | | Merge branch 'fix/import-issue-assignees' into 'master'Sean McGivern2017-10-311-0/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | fix missing issue assigneesJames Lopez2017-10-311-0/+1
* | | | Merge branch 'feature/migrate-wiki-delete-page-to-gitaly' into 'master'Sean McGivern2017-10-312-9/+40
|\ \ \ \
| * | | | Migrate Gitlab::Git::Wiki#delete_page to GitalyAhmad Sherif2017-10-312-9/+40
| |/ / /
* | | | Merge branch '39561-seed_fu-fails-to-load-gitlab-test' into 'master'Sean McGivern2017-10-311-0/+8
|\ \ \ \ | |_|/ / |/| | |
| * | | Handle large values on `MergeRequestDiffCommit` dates39561-seed_fu-fails-to-load-gitlab-testAlejandro Rodríguez2017-10-301-0/+8
| | |/ | |/|
* | | Merge branch '39619-cancel-merge-when-pipeline-succeeds-from-the-api-fails' i...Rémy Coutable2017-10-311-1/+1
|\ \ \
| * | | Fix namespacing for MergeWhenPipelineSucceedsService in MR APIMark Fletcher2017-10-301-1/+1
| |/ /
* | | Merge branch 'add-packagist-project-service' into 'master'Kamil Trzciński2017-10-312-0/+41
|\ \ \ | |_|/ |/| |
| * | Add Packagist project serviceMatt Coleman2017-10-132-0/+41
* | | Only set Auto-Submitted header once39593-emails-on-push-are-sent-to-only-the-first-recipient-when-using-aws-sesSean McGivern2017-10-301-4/+2
| |/ |/|
* | Fix 500 error for old (somewhat) MRsAlexWayfer2017-10-301-3/+5
* | Fetch the merged branches at onceLin Jen-Shin (godfat)2017-10-272-0/+19
* | Merge branch 'zj-commit-cache' into 'master'Sean McGivern2017-10-271-1/+2
|\ \
| * | Cache commits on the repository modelZeger-Jan van de Weg2017-10-271-1/+2
* | | Merge branch 'fix/avoid-using-rugged-in-wiki-preview-slug' into 'master'Sean McGivern2017-10-271-1/+10
|\ \ \
| * | | Avoid using Rugged in Gitlab::Git::Wiki#preview_slugAhmad Sherif2017-10-271-1/+10
* | | | Merge branch '39495-fix-bitbucket-login' into 'master'Rémy Coutable2017-10-271-0/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Fix bitbucket login39495-fix-bitbucket-loginJarka Kadlecova2017-10-261-0/+4
* | | | Merge branch 'an/local_branches_opt_out' into 'master'Douwe Maan2017-10-261-1/+1
|\ \ \ \
| * | | | Make local_branches OPT_OUTan/local_branches_opt_outAndrew Newdigate2017-10-261-1/+1
| |/ / /
* | | | Merge branch 'fix/add-path-attr-to-wiki-file' into 'master'Sean McGivern2017-10-261-1/+2
|\ \ \ \
| * | | | Add path attribute to WikiFile classAhmad Sherif2017-10-261-1/+2
| |/ / /
* | | | Merge branch 'gl-username-hook-fix' into 'master'Douwe Maan2017-10-261-1/+1
|\ \ \ \
| * | | | Fix the incorrect value being used to set GL_USERNAME on hooksgl-username-hook-fixAlejandro Rodríguez2017-10-251-1/+1
| |/ / /
* | | | Merge branch 'api-configure-jira' into 'master'Douwe Maan2017-10-261-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Validate username/pw for Jiraservice, require them in the APIRobert Schilling2017-10-241-2/+2
| |/ /
* | | Merge branch 'gitaly-ff-merge-preparation' into 'master'Rémy Coutable2017-10-252-4/+10
|\ \ \
| * | | Move all rugged operation for ff_merge inside Gitlab::Gitgitaly-ff-merge-preparationAlejandro Rodríguez2017-10-242-4/+10
* | | | Merge branch 'gitaly-gl-username' into 'master'Douwe Maan2017-10-243-17/+10
|\ \ \ \
| * | | | Support `Gitaly::User`'s gl_username fieldgitaly-gl-usernameAlejandro Rodríguez2017-10-233-17/+10
| | |/ / | |/| |
* | | | Merge branch 'sh-memoize-logger' into 'master'Nick Thomas2017-10-241-2/+10
|\ \ \ \
| * | | | Memoize GitLab logger to reduce open file descriptorsStan Hu2017-10-241-2/+10
| |/ / /
* | | | Merge branch '23000-pages-api' into 'master'Grzegorz Bizon2017-10-244-0/+139
|\ \ \ \
| * | | | Add pages domains API implementationTravis Miller2017-10-223-0/+122
| * | | | Add pages domains API entitiesTravis Miller2017-10-221-0/+17
* | | | | Merge branch 'bvl-circuitbreaker-backoff' into 'master'Sean McGivern2017-10-245-13/+54
|\ \ \ \ \
| * | | | | Allow enabling the circuitbreaker using an env variablebvl-circuitbreaker-backoffBob Van Landuyt2017-10-231-1/+10
| * | | | | Perform the stat check multiple times when checking a storageBob Van Landuyt2017-10-232-3/+12
| * | | | | Implement backoff for the circuitbreakerBob Van Landuyt2017-10-234-9/+32
* | | | | | Merge branch 'performance-bar-sql' into 'master'Rémy Coutable2017-10-241-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Remove Sherlock usage from the performance barperformance-bar-sqlYorick Peterse2017-10-231-2/+2
* | | | | | Merge branch 'zj-peek-gitaly' into 'master'Rémy Coutable2017-10-232-0/+43
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add Gitaly data to the Peek performance barZeger-Jan van de Weg2017-10-232-0/+43
View Lorry Controller Status