summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '42730-close-rugged-repository' into 'master'Douwe Maan2018-02-061-0/+4
|\
| * Close low level rugged repository in project cache workerBastian Blank2018-02-061-0/+4
* | Merge branch 'zj/gitlab-ce-zj-wiki-page-versions'Douwe Maan2018-02-062-9/+49
|\ \
| * \ Merge branch 'master' into 'zj-wiki-page-versions'Douwe Maan2018-02-06111-798/+2343
| |\ \
| * | | Allow pagination for WikiVersions on Gitaly requestZeger-Jan van de Weg2018-01-222-41/+17
| * | | Client implementation for WikiPageVerionZeger-Jan van de Weg2018-01-222-15/+79
* | | | Merge branch 'gitaly-lfs-client-prep' into 'master'Robert Speicher2018-02-065-54/+50
|\ \ \ \
| * | | | Refactor Gitlab::Git code related to LFS changes for Gitaly migrationgitaly-lfs-client-prepAlejandro Rodríguez2018-02-025-54/+50
* | | | | Merge branch 'jej/upload-file-tracks-lfs' into 'master'Sean McGivern2018-02-061-0/+25
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | File upload UI obeys LFS filtersJames Edwards-Jones2018-02-061-0/+25
* | | | | Merge branch 'bump-workhorse' into 'master'Nick Thomas2018-02-061-0/+12
|\ \ \ \ \
| * | | | | Upgrade GitLab Workhorse to v3.6.0Kamil Trzciński2018-02-061-0/+12
* | | | | | Rename CreateArtifactsTraceService to CreateTraceArtifactServiceShinya Maeda2018-02-061-8/+0
* | | | | | Revert live-trace pathShinya Maeda2018-02-061-24/+12
* | | | | | Add CreateArtifactsTraceWorkerShinya Maeda2018-02-061-6/+6
* | | | | | Expose current_pathShinya Maeda2018-02-061-6/+6
* | | | | | Check existance of the file when trace_artifact is readShinya Maeda2018-02-061-2/+2
* | | | | | Move default_path to legacy_default_path. Switch to the new path for live-traceShinya Maeda2018-02-061-10/+28
* | | | | | Remove unnecessary changesShinya Maeda2018-02-061-6/+10
* | | | | | Trace as artifactsShinya Maeda2018-02-061-8/+14
|/ / / / /
* | | | | 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 '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 'query-counts' into 'master'Rémy Coutable2018-02-054-0/+185
|\ \ \ \ \ \
| * | | | | | Track and act upon the number of executed queriesquery-countsYorick Peterse2018-02-014-0/+185
* | | | | | | 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
| | |/ / / / / | |/| | | | |
* | | | | | | 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-0214-98/+82
* | | | | | | | 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-016-14/+18
|/ / / / / /
* | | | | | Merge branch '42497-rubocop-style-regexpliteral' into 'master'Rémy Coutable2018-02-0126-40/+40
|\ \ \ \ \ \