summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* update imagechromedriver-testJames Lopez2018-07-061-1/+1
* Merge branch '46396-recognise-when-a-user-is-trying-to-validate-a-private-ssh...Phil Hughes2018-07-067-3/+162
|\
| * (Part 2) Resolve "Recognise when a user is trying to validate a private SSH key"Luke Bennett2018-07-067-3/+162
|/
* Merge branch 'revert-e76b176d' into 'master'Clement Ho2018-07-062-11/+5
|\
| * Revert "Merge branch 'rosulk-patch-12' into 'master'"Victor Wu2018-07-062-11/+5
* | Merge branch '36234-nav-add-groups-dropdown' into 'master'Phil Hughes2018-07-0649-1706/+1894
|\ \
| * | Resolve "Add dropdown to Groups link in top bar"Dennis Tang2018-07-0649-1706/+1894
|/ /
* | Merge branch 'bvl-preload-parents-after-pagination' into 'master'Douwe Maan2018-07-064-16/+44
|\ \
| * | Preload ancestors after pagination when filteringBob Van Landuyt2018-07-064-16/+44
* | | Merge branch 'blackst0ne-rails5-activerecord-statementinvalid-mysql2-error-ex...Yorick Peterse2018-07-062-1/+7
|\ \ \ | |/ / |/| |
| * | [Rails5] Fix milestone GROUP BY queryblackst0ne2018-07-062-1/+7
* | | Merge branch '6653-extract-ee-specific-files-lines-for-discussion-app-service...Douwe Maan2018-07-061-0/+6
|\ \ \ | |_|/ |/| |
| * | Extract EE-specific lines from NotificationServiceSean McGivern2018-07-061-0/+6
* | | Merge branch 'build-chunks-on-object-storage' into 'master'Grzegorz Bizon2018-07-0615-216/+1077
|\ \ \ | |/ / |/| |
| * | Add spec for the ordering of the data storesShinya Maeda2018-07-061-0/+16
| * | Merge branch 'master' into build-chunks-on-object-storageShinya Maeda2018-07-06541-22742/+41360
| |\ \
| * | | Fix specShinya Maeda2018-07-042-4/+4
| * | | Make explicit chunks store classes namespace in factroyShinya Maeda2018-07-041-3/+3
| * | | Decouple optimization for erasing traceShinya Maeda2018-07-041-1/+1
| * | | Rename retry_max left overs to retriesShinya Maeda2018-07-041-1/+1
| * | | Fix static analysysShinya Maeda2018-07-041-8/+8
| * | | Merge branch 'master' into build-chunks-on-object-storageShinya Maeda2018-07-04100-1061/+889
| |\ \ \
| * | | | Add spec for ExclusiveLeaseHelpersShinya Maeda2018-07-034-23/+106
| * | | | Simplified factory traitsShinya Maeda2018-07-031-13/+3
| * | | | Rename retries and remove retry_maxShinya Maeda2018-07-031-3/+2
| * | | | Fix error messageShinya Maeda2018-07-031-1/+1
| * | | | Rename persistable_store instead of persist_storeShinya Maeda2018-07-031-2/+2
| * | | | Fix documentsShinya Maeda2018-07-031-5/+5
| * | | | Merge branch 'master' into build-chunks-on-object-storageShinya Maeda2018-07-03843-6766/+11551
| |\ \ \ \
| * | | | | Support append/truncate for fog storebuild-chunks-on-object-storageShinya Maeda2018-06-252-11/+32
| * | | | | Add specs for each data storeShinya Maeda2018-06-254-0/+441
| * | | | | Enable specs for atomic operationsShinya Maeda2018-06-251-65/+87
| * | | | | Merge branch 'master' into build-chunks-on-object-storageShinya Maeda2018-06-25876-5224/+13255
| |\ \ \ \ \
| * | | | | | Added spec for build trace chunkShinya Maeda2018-06-254-180/+321
| * | | | | | Rename persisted? to data_persisted?Shinya Maeda2018-06-183-14/+10
| * | | | | | Merge branch 'master' into build-chunks-on-object-storageShinya Maeda2018-06-18166-964/+979
| |\ \ \ \ \ \
| * | | | | | | Add changelogShinya Maeda2018-06-151-0/+6
| * | | | | | | Fix dead lock by in_lock conflicts. Shared out in_lock logic. Changed key_r...Shinya Maeda2018-06-154-37/+51
| * | | | | | | Merge branch 'master' into build-chunks-on-object-storageShinya Maeda2018-06-15610-3415/+6002
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into build-chunks-on-object-storageShinya Maeda2018-06-12510-3732/+6134
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Allow to store BuildTraceChunks on Object StorageKamil TrzciƄski2018-06-076-61/+189
* | | | | | | | | | Merge branch 'gitaly-conflicts-find-commit' into 'master'Douwe Maan2018-07-064-106/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Partially rever "Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'ma...Jacob Vosmaer2018-07-064-106/+6
* | | | | | | | | | | Merge branch 'ce-5605-epic-autocomplete' into 'master'Sean McGivern2018-07-063-16/+74
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Backport of EE changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_reque...Mark Chao2018-07-063-16/+74
* | | | | | | | | | | | Merge branch 'ide-merge-request-info' into 'master'Sean McGivern2018-07-0618-68/+294
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | fixed misaligned iconPhil Hughes2018-07-061-1/+1
| * | | | | | | | | | | | updated iconPhil Hughes2018-07-053-5/+5
| * | | | | | | | | | | | fixed where the scrollbar is shown in the merge request panelPhil Hughes2018-07-052-4/+7
| * | | | | | | | | | | | component specPhil Hughes2018-07-053-0/+125