summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Allow public forks to be deduplicatedZeger-Jan van de Weg2018-12-0726-6/+703
* Merge branch 'dm-remove-prune-web-hook-logs-worker' into 'master'Robert Speicher2018-12-076-44/+14
|\
| * Improve PruneWebHookLogsWorker specDouwe Maan2018-12-071-7/+9
| * Remove RemoveOldWebHookLogsWorkerDouwe Maan2018-12-075-37/+5
* | Merge branch 'store-correlation-logs' into 'master'Stan Hu2018-12-0728-46/+400
|\ \
| * | Add `::` to Gitlab::Middleware::CorrelationIdKamil Trzciński2018-12-071-1/+1
| * | Revert "Prefer to use correlation-id in logs"Kamil Trzciński2018-12-069-12/+12
| * | Prefer to use correlation-id in logsKamil Trzciński2018-12-069-12/+12
| * | Log and pass correlation-id between Unicorn, Sidekiq and GitalyKamil Trzciński2018-12-0628-46/+400
* | | Merge branch '48889-populate-merge_commit_sha' into 'master'Douwe Maan2018-12-076-4/+294
|\ \ \
| * | | Guard with feature flagMark Chao2018-12-072-14/+43
| * | | Fix commit with two parents is set with wrong direct_ancestorMark Chao2018-12-072-11/+41
| * | | Update merge request's merge_commit for branch updateMark Chao2018-12-076-5/+236
* | | | Merge branch '22548-reopen-error-message' into 'master'Filipa Lacerda2018-12-075-16/+55
|\ \ \ \
| * | | | Updated ajax error message with returned errorsPhil Hughes2018-12-071-6/+10
| * | | | Inline the new checks into normal update error handlingNick Thomas2018-12-073-22/+30
| * | | | Add changelog entry for MR reopening error messageAkos Gyimesi2018-12-061-0/+6
| * | | | Link to conflicting MR in reopening error messageAkos Gyimesi2018-12-063-5/+10
| * | | | Improve error message when attempting to reopen MR and there's a new open MR ...Akos Gyimesi2018-12-063-1/+17
* | | | | Merge branch '7772-add-subscription-table-to-gitlab-com-billing-areas-ce' int...Douwe Maan2018-12-072-2/+18
|\ \ \ \ \
| * | | | | Backports some changes from gitlab-ee!7885Rubén Dávila2018-12-072-2/+18
* | | | | | Merge branch 'fix-transaction-shard' into 'master'Douwe Maan2018-12-071-1/+3
|\ \ \ \ \ \
| * | | | | | Fix transaction pollution in Shard.by_nameNick Thomas2018-12-071-1/+3
* | | | | | | Merge branch 'docs-for-mr-pipelines' into 'master'Marcia Ramos2018-12-077-76/+201
|\ \ \ \ \ \ \
| * | | | | | | Consistent feature name in all docsMarcia Ramos2018-12-071-2/+2
| * | | | | | | Small improvement for phrasingShinya Maeda2018-12-071-3/+3
| * | | | | | | Improve wording in mr index.mdShinya Maeda2018-12-071-1/+1
| * | | | | | | Documentation for merge request pipelinesShinya Maeda2018-12-077-76/+201
* | | | | | | | Merge branch 'gt-show-primary-button-when-all-labels-are-prioritized' into 'm...Phil Hughes2018-12-073-1/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | Show primary button when all labels are prioritizedGeorge Tsiolis2018-12-073-1/+21
|/ / / / / / / /
* | | | | | | | Merge branch 'docs-search' into 'master'Achilleas Pipinellis2018-12-071-12/+16
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Fix minor issues in search API docJan Provaznik2018-12-071-12/+16
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'bvl-port-of-dylans-spec-fix' into 'master'Douwe Maan2018-12-071-4/+6
|\ \ \ \ \ \ \
| * | | | | | | Remove Sidekiq::Testing in RepositoryController specDylan Griffith2018-12-071-4/+6
* | | | | | | | Merge branch 'kp-8703-fix-labels-tooltip-alignment' into 'master'Filipa Lacerda2018-12-071-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Add missing `data-boundary` attribute for correct tooltip alignmentKushal Pandya2018-12-071-0/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'winh-milestone-select' into 'master'Kushal Pandya2018-12-072-4/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix duplicate boardsStore variable in milestone selectWinnie Hellmann2018-12-062-4/+9
* | | | | | | | | Merge branch 'danger-docs-update' into 'master'Achilleas Pipinellis2018-12-071-9/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update docs' DangerfileMarcia Ramos2018-12-061-9/+10
* | | | | | | | | | Merge branch 'jprovazn-fast-upload-delete' into 'master'Grzegorz Bizon2018-12-0717-18/+362
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Fixed before_destroy callbackJan Provaznik2018-12-061-1/+1
| * | | | | | | | | Allow pass additional options to use_fast_destroyJan Provaznik2018-12-062-8/+4
| * | | | | | | | | Enabled feature flag for fast deletionsJan Provaznik2018-12-064-7/+55
| * | | | | | | | | Use FastDestroy for deleting uploadsJan Provaznik2018-12-0618-22/+322
* | | | | | | | | | Merge branch 'fix/gb/encrypt-ci-build-token' into 'master'Kamil Trzciński2018-12-079-6/+128
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Encrypt CI/CD builds tokensKamil Trzciński2018-12-079-6/+128
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'master' into 'master'Douwe Maan2018-12-071-3/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed misreported error codes and elaboratedJames Powis2018-12-061-3/+2
* | | | | | | | | | | Merge branch 'move-group-issues-search-cte-up-the-chain' into 'master'Douwe Maan2018-12-075-11/+168
|\ \ \ \ \ \ \ \ \ \ \