Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Allow public forks to be deduplicated | Zeger-Jan van de Weg | 2018-12-07 | 26 | -6/+703 |
* | Merge branch 'dm-remove-prune-web-hook-logs-worker' into 'master' | Robert Speicher | 2018-12-07 | 6 | -44/+14 |
|\ | |||||
| * | Improve PruneWebHookLogsWorker spec | Douwe Maan | 2018-12-07 | 1 | -7/+9 |
| * | Remove RemoveOldWebHookLogsWorker | Douwe Maan | 2018-12-07 | 5 | -37/+5 |
* | | Merge branch 'store-correlation-logs' into 'master' | Stan Hu | 2018-12-07 | 28 | -46/+400 |
|\ \ | |||||
| * | | Add `::` to Gitlab::Middleware::CorrelationId | Kamil Trzciński | 2018-12-07 | 1 | -1/+1 |
| * | | Revert "Prefer to use correlation-id in logs" | Kamil Trzciński | 2018-12-06 | 9 | -12/+12 |
| * | | Prefer to use correlation-id in logs | Kamil Trzciński | 2018-12-06 | 9 | -12/+12 |
| * | | Log and pass correlation-id between Unicorn, Sidekiq and Gitaly | Kamil Trzciński | 2018-12-06 | 28 | -46/+400 |
* | | | Merge branch '48889-populate-merge_commit_sha' into 'master' | Douwe Maan | 2018-12-07 | 6 | -4/+294 |
|\ \ \ | |||||
| * | | | Guard with feature flag | Mark Chao | 2018-12-07 | 2 | -14/+43 |
| * | | | Fix commit with two parents is set with wrong direct_ancestor | Mark Chao | 2018-12-07 | 2 | -11/+41 |
| * | | | Update merge request's merge_commit for branch update | Mark Chao | 2018-12-07 | 6 | -5/+236 |
* | | | | Merge branch '22548-reopen-error-message' into 'master' | Filipa Lacerda | 2018-12-07 | 5 | -16/+55 |
|\ \ \ \ | |||||
| * | | | | Updated ajax error message with returned errors | Phil Hughes | 2018-12-07 | 1 | -6/+10 |
| * | | | | Inline the new checks into normal update error handling | Nick Thomas | 2018-12-07 | 3 | -22/+30 |
| * | | | | Add changelog entry for MR reopening error message | Akos Gyimesi | 2018-12-06 | 1 | -0/+6 |
| * | | | | Link to conflicting MR in reopening error message | Akos Gyimesi | 2018-12-06 | 3 | -5/+10 |
| * | | | | Improve error message when attempting to reopen MR and there's a new open MR ... | Akos Gyimesi | 2018-12-06 | 3 | -1/+17 |
* | | | | | Merge branch '7772-add-subscription-table-to-gitlab-com-billing-areas-ce' int... | Douwe Maan | 2018-12-07 | 2 | -2/+18 |
|\ \ \ \ \ | |||||
| * | | | | | Backports some changes from gitlab-ee!7885 | Rubén Dávila | 2018-12-07 | 2 | -2/+18 |
* | | | | | | Merge branch 'fix-transaction-shard' into 'master' | Douwe Maan | 2018-12-07 | 1 | -1/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix transaction pollution in Shard.by_name | Nick Thomas | 2018-12-07 | 1 | -1/+3 |
* | | | | | | | Merge branch 'docs-for-mr-pipelines' into 'master' | Marcia Ramos | 2018-12-07 | 7 | -76/+201 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Consistent feature name in all docs | Marcia Ramos | 2018-12-07 | 1 | -2/+2 |
| * | | | | | | | Small improvement for phrasing | Shinya Maeda | 2018-12-07 | 1 | -3/+3 |
| * | | | | | | | Improve wording in mr index.md | Shinya Maeda | 2018-12-07 | 1 | -1/+1 |
| * | | | | | | | Documentation for merge request pipelines | Shinya Maeda | 2018-12-07 | 7 | -76/+201 |
* | | | | | | | | Merge branch 'gt-show-primary-button-when-all-labels-are-prioritized' into 'm... | Phil Hughes | 2018-12-07 | 3 | -1/+21 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Show primary button when all labels are prioritized | George Tsiolis | 2018-12-07 | 3 | -1/+21 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'docs-search' into 'master' | Achilleas Pipinellis | 2018-12-07 | 1 | -12/+16 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Fix minor issues in search API doc | Jan Provaznik | 2018-12-07 | 1 | -12/+16 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'bvl-port-of-dylans-spec-fix' into 'master' | Douwe Maan | 2018-12-07 | 1 | -4/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove Sidekiq::Testing in RepositoryController spec | Dylan Griffith | 2018-12-07 | 1 | -4/+6 |
* | | | | | | | | Merge branch 'kp-8703-fix-labels-tooltip-alignment' into 'master' | Filipa Lacerda | 2018-12-07 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add missing `data-boundary` attribute for correct tooltip alignment | Kushal Pandya | 2018-12-07 | 1 | -0/+1 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'winh-milestone-select' into 'master' | Kushal Pandya | 2018-12-07 | 2 | -4/+9 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix duplicate boardsStore variable in milestone select | Winnie Hellmann | 2018-12-06 | 2 | -4/+9 |
* | | | | | | | | | Merge branch 'danger-docs-update' into 'master' | Achilleas Pipinellis | 2018-12-07 | 1 | -9/+10 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Update docs' Dangerfile | Marcia Ramos | 2018-12-06 | 1 | -9/+10 |
* | | | | | | | | | | Merge branch 'jprovazn-fast-upload-delete' into 'master' | Grzegorz Bizon | 2018-12-07 | 17 | -18/+362 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Fixed before_destroy callback | Jan Provaznik | 2018-12-06 | 1 | -1/+1 |
| * | | | | | | | | | Allow pass additional options to use_fast_destroy | Jan Provaznik | 2018-12-06 | 2 | -8/+4 |
| * | | | | | | | | | Enabled feature flag for fast deletions | Jan Provaznik | 2018-12-06 | 4 | -7/+55 |
| * | | | | | | | | | Use FastDestroy for deleting uploads | Jan Provaznik | 2018-12-06 | 18 | -22/+322 |
* | | | | | | | | | | Merge branch 'fix/gb/encrypt-ci-build-token' into 'master' | Kamil Trzciński | 2018-12-07 | 9 | -6/+128 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Encrypt CI/CD builds tokens | Kamil Trzciński | 2018-12-07 | 9 | -6/+128 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'master' into 'master' | Douwe Maan | 2018-12-07 | 1 | -3/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fixed misreported error codes and elaborated | James Powis | 2018-12-06 | 1 | -3/+2 |
* | | | | | | | | | | | Merge branch 'move-group-issues-search-cte-up-the-chain' into 'master' | Douwe Maan | 2018-12-07 | 5 | -11/+168 |
|\ \ \ \ \ \ \ \ \ \ \ |