summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Validate user namespace before saving so that errors persist on modeldm-user-namespace-route-path-validationDouwe Maan2018-02-066-16/+36
* 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
| * | | | | Drop filename enforcementShinya Maeda2018-02-061-6/+0
| * | | | | Add FixtureHelpers for FactoryGirlShinya Maeda2018-02-061-0/+3
| * | | | | GB catches: CreateTraceArtifactService project, user passShinya Maeda2018-02-061-2/+2
| * | | | | Alessio catches: Test fixShinya Maeda2018-02-062-2/+2
| * | | | | Backport sample_trace in fixturesShinya Maeda2018-02-061-16/+1183
| * | | | | Remove unnecessary changes for job features specShinya Maeda2018-02-061-5/+5
| * | | | | Finish all testsShinya Maeda2018-02-065-28/+82
| * | | | | update docShinya Maeda2018-02-061-2/+2
| * | | | | Fix create_trace_artifact_worker_spec.rbShinya Maeda2018-02-061-1/+1
| * | | | | Add changelogShinya Maeda2018-02-061-0/+5
| * | | | | Fix retry_build_service_spec.rb with trace_artifact traitShinya Maeda2018-02-062-1/+7
| * | | | | Add essential testsShinya Maeda2018-02-069-1/+241
| * | | | | Fix inital test failuresShinya Maeda2018-02-062-5/+8
| * | | | | Add worker queueShinya Maeda2018-02-063-2/+3
| * | | | | Rename CreateArtifactsTraceService to CreateTraceArtifactServiceShinya Maeda2018-02-066-33/+25
| * | | | | Revert live-trace pathShinya Maeda2018-02-061-24/+12
| * | | | | Add CreateArtifactsTraceWorkerShinya Maeda2018-02-066-21/+35
| * | | | | Expose current_pathShinya Maeda2018-02-062-9/+11
| * | | | | 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
| * | | | | JobArtifactUploader#open raise execption if its not FilestorageShinya Maeda2018-02-061-1/+3
| * | | | | Inlcude the size of trace artifactsShinya Maeda2018-02-061-2/+1
| * | | | | Remove unnecessary changesShinya Maeda2018-02-061-6/+10
| * | | | | Trace as artifactsShinya Maeda2018-02-065-10/+33
| | |/ / / | |/| | |
* | | | | Merge branch 'fix/show-sidebar-sub-level-items-for-billing' into 'master'Sean McGivern2018-02-063-1/+10
|\ \ \ \ \
| * | | | | Override group sidebar linksGeorge Tsiolis2018-02-063-1/+10
View Lorry Controller Status