summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add a note about merge conflicts in `gitlab.pot`bvl-pot-merge-conflicts-docsBob Van Landuyt2018-02-071-0/+3
* Merge branch 'update-helm-chart-docs' into 'master'Marcia Ramos2018-02-062-11/+12
|\
| * Fix linksupdate-helm-chart-docsJoshua Lambert2018-02-061-2/+2
| * TyposJoshua Lambert2018-02-061-2/+2
| * Clarify that gitlab-omnibus is the best way to install gitlabJoshua Lambert2018-02-061-1/+1
| * Minor cleanup 2.0Joshua Lambert2018-01-312-2/+2
| * Minor cleanupJoshua Lambert2018-01-312-2/+2
| * Updates to helm chart docsJoshua Lambert2018-01-312-11/+12
* | Merge branch 'dm-route-path-validation' into 'master'Sean McGivern2018-02-0623-126/+53
|\ \
| * | Add changelogdm-route-path-validationDouwe Maan2018-02-061-0/+5
| * | Validate User username only on Namespace, and bubble up appropriatelyDouwe Maan2018-02-0612-90/+23
| * | Validate path uniqueness only on Route, and bubble up appropriatelyDouwe Maan2018-02-0612-37/+26
* | | Merge branch 'dm-user-namespace-route-path-validation' into 'master'Sean McGivern2018-02-066-16/+36
|\ \ \ | |/ /
| * | Validate user namespace before saving so that errors persist on modeldm-user-namespace-route-path-validationDouwe Maan2018-02-066-16/+36
* | | Merge branch 'dm-sidekiq-memory-killer-getcwd' into 'master'Stan Hu2018-02-061-1/+1
|\ \ \
| * | | Explicitly set cwd in Sidekiq memory killer instead of depending on getcwddm-sidekiq-memory-killer-getcwdDouwe Maan2018-02-061-1/+1
* | | | Merge branch 'ce-4813-quickfix' into 'master'Sean McGivern2018-02-061-1/+1
|\ \ \ \
| * | | | Reset Project's column information in spec/lib/gitlab/background_migration/po...ce-4813-quickfixRémy Coutable2018-02-061-1/+1
|/ / / /
* | | | Merge branch '42730-close-rugged-repository' into 'master'Douwe Maan2018-02-065-1/+19
|\ \ \ \
| * | | | Close low level rugged repository in project cache workerBastian Blank2018-02-065-1/+19
* | | | | Merge branch 'zj/gitlab-ce-zj-wiki-page-versions'Douwe Maan2018-02-064-19/+75
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into 'zj-wiki-page-versions'Douwe Maan2018-02-061370-12520/+25427
| |\ \ \ \ \
| * | | | | | Allow pagination for WikiVersions on Gitaly requestZeger-Jan van de Weg2018-01-223-43/+19
| * | | | | | Upgrade Gitaly versionsZeger-Jan van de Weg2018-01-221-1/+1
| * | | | | | Client implementation for WikiPageVerionZeger-Jan van de Weg2018-01-224-25/+105
* | | | | | | Merge branch 'gitaly-lfs-client-prep' into 'master'Robert Speicher2018-02-068-92/+81
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Refactor Gitlab::Git code related to LFS changes for Gitaly migrationgitaly-lfs-client-prepAlejandro Rodríguez2018-02-028-92/+81
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'zj-protobuf' into 'master'Marin Jankovski2018-02-064-2/+10
|\ \ \ \ \ \
| * | | | | | Downgrade google-protobufZeger-Jan van de Weg2018-02-064-2/+10
|/ / / / / /
* | | | | | Merge branch '42669-allow-order_by-users-in-gitlab-api' into 'master'Douwe Maan2018-02-064-1/+46
|\ \ \ \ \ \
| * | | | | | Add sorting options for /users API (admin only)42669-allow-order_by-users-in-gitlab-apiDmitriy Zaporozhets2018-02-064-1/+46
* | | | | | | Merge branch 'jej/upload-file-tracks-lfs' into 'master'Sean McGivern2018-02-067-1/+203
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | File upload UI obeys LFS filtersJames Edwards-Jones2018-02-067-1/+203
* | | | | | | Merge branch 'winh-kubernetes-clusters' into 'master'Phil Hughes2018-02-0638-192/+262
|\ \ \ \ \ \ \
| * | | | | | | Replace "cluster" with "Kubernetes cluster"winh-kubernetes-clustersWinnie Hellmann2018-02-0638-192/+262
* | | | | | | | Merge branch 'bump-workhorse' into 'master'Nick Thomas2018-02-064-1/+35
|\ \ \ \ \ \ \ \
| * | | | | | | | Upgrade GitLab Workhorse to v3.6.0Kamil Trzciński2018-02-064-1/+35
* | | | | | | | | Merge branch '14256-upload-destroy-removes-file' into 'master'Sean McGivern2018-02-065-0/+54
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | improvements from feedback14256-upload-destroy-removes-fileMicaël Bergeron2018-02-063-2/+14
| * | | | | | | | | [ci-skip] add changelogMicaël Bergeron2018-02-061-0/+5
| * | | | | | | | | remove file after `Upload#destroy`Micaël Bergeron2018-02-063-0/+37
* | | | | | | | | | Merge branch '42693-add-a-link-to-documentation-on-how-to-get-external-ip-in-...Tim Zallmann2018-02-066-4/+35
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Resolve "Add a link to documentation on how to get external ip in the Kuberne...Fabio Busatto2018-02-066-4/+35
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'feature/sm/artifacts-trace' into 'master'Kamil Trzciński2018-02-0628-61/+1556
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Reorder async/sync tasks in BuildFinishedWorker to read traces efficientlyfeature/sm/artifacts-traceShinya Maeda2018-02-062-12/+11
| * | | | | | | | | Fix tests for Drop filename enforcementShinya Maeda2018-02-062-17/+1
| * | | | | | | | | Revert using expand_fixture_path in factoryShinya Maeda2018-02-061-1/+1
| * | | | | | | | | Revert "Add FixtureHelpers for FactoryGirl"Shinya Maeda2018-02-061-3/+0
| * | | | | | | | | Refactor :trace to :trace_live in specShinya Maeda2018-02-068-25/+25
| * | | | | | | | | Make all workers in BuildFinishedWorker to run async and reorderShinya Maeda2018-02-061-2/+2
View Lorry Controller Status