summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Added ldap config setting to lower case usernamesFrancisco Javier López2018-02-053-1/+13
* Allow moving wiki pages from the UIFrancisco Javier López2018-02-051-5/+19
* Merge branch 'fix/gitaly-wiki-encoding-issues' into 'master'Robert Speicher2018-02-051-0/+5
|\
| * Encode GitalyClient::WikiPage attributes to UTF-8fix/gitaly-wiki-encoding-issuesAhmad Sherif2018-02-051-0/+5
* | Merge branch '42547-upload-store-mount-point' into 'master'Sean McGivern2018-02-051-1/+1
|\ \
| * | add the uploader context to the upload modelMicaël Bergeron2018-02-021-1/+1
* | | Enable Prometheus metrics for deployed IngressesJoshua Lambert2018-02-051-2/+6
* | | Merge branch 'api-guard' into 'master'Rémy Coutable2018-02-051-1/+5
|\ \ \
| * | | Make find_user_from_sources extensible for EELin Jen-Shin2018-02-051-1/+5
* | | | Merge branch 'gitaly-user-squash' into 'master'Rémy Coutable2018-02-052-26/+63
|\ \ \ \ | |_|_|/ |/| | |
| * | | Incorporate OperationService.UserSquash Gitaly RPCgitaly-user-squashAlejandro Rodríguez2018-02-022-26/+63
* | | | Merge branch 'zj-fix-flay' into 'master'Rémy Coutable2018-02-051-1/+1
|\ \ \ \
| * | | | Fix flay not detecting identical codeZeger-Jan van de Weg2018-01-311-1/+1
* | | | | Merge branch 'query-counts' into 'master'Rémy Coutable2018-02-0516-0/+223
|\ \ \ \ \
| * | | | | Track and act upon the number of executed queriesquery-countsYorick Peterse2018-02-0116-0/+223
* | | | | | Merge branch '25327-coverage-badge-rounding' into 'master'Rémy Coutable2018-02-052-3/+3
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Change coverage badge rounding for other CI system consistencyJeff Stubler2018-02-012-3/+3
| |/ / / /
* | | | | Merge branch 'zj-ref-contains' into 'master'Douwe Maan2018-02-044-16/+63
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into 'zj-ref-contains'zj-ref-containsDouwe Maan2018-02-013-1/+27
| |\ \ \ \ \
| * | | | | | Remove intermediate methods on Branch and Tag classesZeger-Jan van de Weg2018-02-014-28/+17
| * | | | | | Fix encoding issues when name is not UTF-8Zeger-Jan van de Weg2018-02-011-2/+8
| * | | | | | Client changes for Tag,BranchNamesContainingCommitZeger-Jan van de Weg2018-02-014-21/+73
| | |/ / / / | |/| | | |
* | | | | | Use %r around multi-line regular expressionsDouwe Maan2018-02-021-4/+4
| |_|_|/ / |/| | | |
* | | | | Merge branch '24167__color_label' into 'master'Douwe Maan2018-02-024-0/+77
|\ \ \ \ \
| * | | | | Fix minorsTony Rom2018-02-011-14/+8
| * | | | | Add Colors to GitLab Flavored MarkdownTony Rom2018-01-294-0/+83
* | | | | | Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' i...Douwe Maan2018-02-021-6/+22
|\ \ \ \ \ \
| * | | | | | Sanitize extra blank spaces used when uploading a SSH keyRubén Dávila2018-02-011-6/+22
* | | | | | | Merge branch 'bvl-fix-500-on-fork-without-restricted-visibility-levels' into ...Douwe Maan2018-02-021-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Avoid error when no restricted levels are definedbvl-fix-500-on-fork-without-restricted-visibility-levelsBob Van Landuyt2018-02-021-1/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | use Gitlab::UserSettings directly as a singleton instead of including/extendi...Mario de la Ossa2018-02-0216-105/+85
* | | | | | | fix label issueJames Lopez2018-02-021-3/+2
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch 'master' into '3867-port-to-ce'Sean McGivern2018-02-023-2/+28
|\ \ \ \ \ \
| * | | | | | Fix an issue where sparse checkout wasn't configured correctly42223-squashing-mrs-takes-too-longAlejandro Rodríguez2018-02-011-1/+1
| |/ / / / /
| * | | | | Merge branch 'gitaly-970-repo-write-config' into 'master'Robert Speicher2018-02-013-1/+27
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Migrate Gitlab::Git::Repository#write_config to Gitalygitaly-970-repo-write-configKim "BKC" Carlbäcker2018-01-313-1/+27
* | | | | | port of 594e6a0a625^..f74c90f68c6Micaël Bergeron2018-02-018-18/+22
|/ / / / /
* | | | | Merge branch '42497-rubocop-style-regexpliteral' into 'master'Rémy Coutable2018-02-0133-56/+56
|\ \ \ \ \
| * | | | | Enable RuboCop Style/RegexpLiteralTakuya Noguchi2018-02-0133-56/+56
| |/ / / /
* | | | | Merge branch 'repository-log-disable-walk' into 'master'Douwe Maan2018-01-312-25/+2
|\ \ \ \ \
| * | | | | Remove Rugged::Walk implementation of #logrepository-log-disable-walkJacob Vosmaer2018-01-312-25/+2
* | | | | | [ci skip] Fix example commands to refer to the correct versionsAlejandro Rodríguez2018-01-311-1/+1
| |_|/ / / |/| | | |
* | | | | Merge branch 'rugged-reference-cache-rescue' into 'master'Sean McGivern2018-01-311-0/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Remove Rugged exception in cache rescuerugged-reference-cache-rescueJacob Vosmaer2018-01-301-0/+2
* | | | | Merge branch 'sh-fix-project-members-api-perf' into 'master'Rémy Coutable2018-01-314-30/+25
|\ \ \ \ \
| * | | | | Remove N+1 queries with /projects/:project_id/{access_requests,members} API e...sh-fix-project-members-api-perfStan Hu2018-01-304-30/+25
| | |/ / / | |/| | |
* | | | | Merge branch 'zj-gitaly-server-info' into 'master'Sean McGivern2018-01-312-0/+59
|\ \ \ \ \
| * | | | | Gitaly Server info for admin panelZeger-Jan van de Weg2018-01-312-0/+59
| | |_|_|/ | |/| | |
* | | | | Merge branch 'fix/move-can-be-merged-to-lib-git' into 'master'Grzegorz Bizon2018-01-311-0/+18
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Move Repository#can_be_merged? to Gitlab::Git::Repositoryfix/move-can-be-merged-to-lib-gitAhmad Sherif2018-01-301-0/+18
View Lorry Controller Status