summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '45505-lograge_formatter_encoding' into 'master'Kamil Trzciński2018-06-071-0/+17
|\
| * Enforce UTF-8 encoding on user input in LogrageWithTimestamp formatter and fi...Imre Farkas2018-06-061-0/+17
* | Merge branch 'fj-move-rev-list-option' into 'master'Douwe Maan2018-06-072-3/+5
|\ \
| * | Moving rev-list lfs options to LfschangesFrancisco Javier López2018-06-062-3/+5
* | | Resolve "Introduce new navigation themes in GitLab 11.0"Annabel Gray2018-06-071-5/+10
|/ /
* | Support LFS objects when creating a project by importFrancisco Javier López2018-06-066-5/+106
* | Merge branch '42751-rename-master-to-maintainer' into 'master'Sean McGivern2018-06-062-9/+9
|\ \
| * | change wordingMark Chao2018-06-061-1/+1
| * | Rename master to maintainerMark Chao2018-06-061-8/+8
* | | Merge branch 'live-trace-v2-persist-data' into 'master'Kamil Trzciński2018-06-061-2/+22
|\ \ \
| * | | Fix the query to select stale live tracesShinya Maeda2018-06-061-19/+23
| * | | Fix ambiguous stuck ci job worker's spec. Rename lease key of archiveShinya Maeda2018-06-061-1/+1
| * | | Add exclusive relase for trace arhiveShinya Maeda2018-06-061-14/+30
* | | | Merge branch 'gitaly-find-commit-go-git' into 'master'Sean McGivern2018-06-062-0/+17
|\ \ \ \ | |_|/ / |/| | |
| * | | Rescue from failed feature lookupsJacob Vosmaer2018-06-061-0/+4
| * | | Simplify server feature flagsJacob Vosmaer2018-06-062-15/+7
| * | | Set Gitaly Server feature flags from RailsZeger-Jan van de Weg2018-06-062-0/+21
| |/ /
* | | Merge branch '47189-github_import_visibility' into 'master'Douwe Maan2018-06-061-1/+4
|\ \ \
| * | | Use Github repo visibility during import while respecting restricted visibili...Imre Farkas2018-06-061-1/+4
| | |/ | |/|
* | | Merge branch 'bvl-graphql-start-34754' into 'master'Douwe Maan2018-06-066-0/+153
|\ \ \ | |_|/ |/| |
| * | Initial setup GraphQL using graphql-ruby 1.8Bob Van Landuyt2018-06-064-69/+89
| * | Handle exceptions outside the GraphQL schemaBob Van Landuyt2018-06-052-0/+42
| * | Add `present_using` to typesBob Van Landuyt2018-06-051-0/+34
| * | Convert from GraphQL::Batch to BatchLoaderNick Thomas2018-06-051-0/+2
| * | Add a minimal GraphQL APINick Thomas2018-06-051-0/+55
* | | Merge branch 'sh-reject-non-utf8-gpg' into 'master'Robert Speicher2018-06-051-1/+5
|\ \ \
| * | | Reject GPG keys that have e-mail or names with non-valid UTF-8 encodingsStan Hu2018-06-051-1/+5
| | |/ | |/|
* | | Fix repository archive generation when hashed storage is enabledNick Thomas2018-06-051-8/+4
|/ /
* | Merge branch 'master' into 'backstage/gb/use-persisted-stages-to-improve-pipe...Kamil Trzciński2018-06-055-15/+9
|\ \ | |/
| * Find and mark more Git disk access locationsJacob Vosmaer (GitLab)2018-06-054-14/+8
| * Merge branch '42751-rename-mr-maintainer-push' into 'master'Robert Speicher2018-06-051-1/+1
| |\
| | * Rephrase "maintainer" to more precise "members who can merge to the target br...42751-rename-mr-maintainer-pushMark Chao2018-06-011-1/+1
* | | Merge branch 'master' into 'backstage/gb/use-persisted-stages-to-improve-pipe...Grzegorz Bizon2018-06-055-18/+91
|\ \ \ | |/ /
| * | Prevent Gitaly WriteConfig log noiseJacob Vosmaer (GitLab)2018-06-051-0/+5
| * | Merge branch 'add-background-migrations-for-not-archived-traces' into 'master'Kamil Trzciński2018-06-051-0/+24
| |\ \
| | * | Revise comments in ArchiveLegacyTracesShinya Maeda2018-06-041-3/+3
| | * | Directly refer application code from migration codeShinya Maeda2018-06-041-66/+11
| | * | Add background migrations to arhive legacy tracesShinya Maeda2018-06-041-0/+79
| * | | Merge branch 'override-consider-extend' into 'master'Nick Thomas2018-06-051-3/+13
| |\ \ \
| | * | | Also verify if extending would override a class methodoverride-consider-extendLin Jen-Shin2018-06-051-3/+13
| * | | | Merge branch 'gh-importer-transactions' into 'master'Nick Thomas2018-06-051-14/+42
| |\ \ \ \
| | * | | | Perform pull request IO work outside a transactiongh-importer-transactionsYorick Peterse2018-06-041-14/+42
| | |/ / /
| * | | | Merge branch 'perform-ci-build-auth-always-on-primary-ce' into 'master'Grzegorz Bizon2018-06-051-1/+7
| |\ \ \ \
| | * | | | Bring back the EE changes to CE to authentication of buildsperform-ci-build-auth-always-on-primary-ceKamil Trzciński2018-06-041-1/+7
| | |/ / /
* | | | | Merge branch 'master' into 'backstage/gb/use-persisted-stages-to-improve-pipe...backstage/gb/use-persisted-stages-to-improve-pipelines-tableGrzegorz Bizon2018-06-0538-83/+362
|\ \ \ \ \ | |/ / / /
| * | | | Adjust insufficient diff hunks being persisted on NoteDiffFileosw-ignore-diff-header-when-persisting-diff-hunkOswaldo Ferreira2018-06-052-3/+10
| |/ / /
| * | | Backport EE SlashCommand RefactorMark Chao2018-06-041-8/+10
| * | | Merge branch 'rails5-fix-46281' into 'master'Yorick Peterse2018-06-041-2/+7
| |\ \ \
| | * | | Rails5 Fix arel fromJasper Maes2018-06-021-2/+7
| | |/ /
| * | | Add ability to search wiki titlesFrancisco Javier López2018-06-043-8/+44