summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* update imagechromedriver-testJames Lopez2018-07-061-1/+1
|
* Merge branch ↵Phil Hughes2018-07-067-3/+162
|\ | | | | | | | | | | | | | | | | '46396-recognise-when-a-user-is-trying-to-validate-a-private-ssh-key' into 'master' (Part 2) Resolve "Recognise when a user is trying to validate a private SSH key" Closes #46396 See merge request gitlab-org/gitlab-ce!19997
| * (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'" See merge request gitlab-org/gitlab-ce!20428
| * Revert "Merge branch 'rosulk-patch-12' into 'master'"Victor Wu2018-07-062-11/+5
| | | | | | This reverts merge request !19250
* | Merge branch '36234-nav-add-groups-dropdown' into 'master'Phil Hughes2018-07-0649-1706/+1894
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Add dropdown to Groups link in top bar" Closes #36234 See merge request gitlab-org/gitlab-ce!18280
| * | 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 filtering Closes #40785 See merge request gitlab-org/gitlab-ce!20398
| * | Preload ancestors after pagination when filteringBob Van Landuyt2018-07-064-16/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | We need to preload the ancestors of search results after applying pagination limits. This way the search results itself are paginated, but not the ancestors. If we don't do this, we might not preload a parent group of a search result as it has been cut off by pagination.
* | | Merge branch ↵Yorick Peterse2018-07-062-1/+7
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | 'blackst0ne-rails5-activerecord-statementinvalid-mysql2-error-expression-1-of-select-list-is-not-in-group-by-clause' into 'master' [Rails5] Fix milestone GROUP BY query Closes #48428 See merge request gitlab-org/gitlab-ce!20256
| * | [Rails5] Fix milestone GROUP BY queryblackst0ne2018-07-062-1/+7
| | |
* | | Merge branch ↵Douwe Maan2018-07-061-0/+6
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | '6653-extract-ee-specific-files-lines-for-discussion-app-services' into 'master' Extract EE-specific lines from NotificationService See merge request gitlab-org/gitlab-ce!20406
| * | 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
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Allow to store BuildTraceChunks on Object Storage Closes #45712 See merge request gitlab-org/gitlab-ce!19515
| * | 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 ↵Shinya Maeda2018-06-154-37/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | key_raw path of fog store. and some bug fixes to make it functional.
| * | | | | | | 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 revert "Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'master'"" See merge request gitlab-org/gitlab-ce!20422
| * | | | | | | | | | Partially rever "Revert "Merge branch 'gitaly-mandatory-20180703-jv' into ↵Jacob Vosmaer2018-07-064-106/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master'"" This partially reverts commit 64dfe2cba1594b67e56233230be8137fa0afacf9.
* | | | | | | | | | | Merge branch 'ce-5605-epic-autocomplete' into 'master'Sean McGivern2018-07-063-16/+74
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of EE changes "Add support for autocompleting Epics and Labels within Epics" See merge request gitlab-org/gitlab-ce!20419
| * | | | | | | | | | | Backport of EE changes in ↵Mark Chao2018-07-063-16/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6195 Refactor AutocompleteSources#label: 1. The return value was inconsistent, sometimes returning a hash and sometimes returning an ActiveModel. 2. It was inconsistent with respect to other methods in the class since they all return ActiveModels.
* | | | | | | | | | | | Merge branch 'ide-merge-request-info' into 'master'Sean McGivern2018-07-0618-68/+294
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added merge request info to Web IDE sidebar Closes #45187 See merge request gitlab-org/gitlab-ce!19860
| * | | | | | | | | | | | 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
| | | | | | | | | | | | |
View Lorry Controller Status