summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update VERSION to 11.1.0-rc5v11.1.0-rc5GitLab Release Tools Bot2018-07-061-1/+1
* Merge branch 'master' into 11-1-stable-prepare-rc5Alessio Caiazza2018-07-0690-235/+1124
|\
| * Merge branch 'remove-trace-efficiently' into 'master'Kamil Trzciński2018-07-065-14/+140
| |\
| | * Fix static analysysShinya Maeda2018-07-061-8/+8
| | * Add specShinya Maeda2018-07-062-6/+118
| | * Revice the changelogShinya Maeda2018-07-062-2/+1
| | * Remove raising error at erase_old_trace!Shinya Maeda2018-07-061-1/+1
| | * Merge branch 'master' into remove-trace-efficientlyShinya Maeda2018-07-06541-22742/+41360
| | |\
| | * | Invalidate memoization after its erasedShinya Maeda2018-07-041-0/+2
| | * | Simplify the commentsShinya Maeda2018-07-041-5/+2
| | * | Add changelogShinya Maeda2018-07-041-0/+5
| | * | Remove traces efficientlyShinya Maeda2018-07-042-8/+19
| * | | Merge branch 'fix-trace-archive-cron-worker-race-condition' into 'master'Kamil Trzciński2018-07-067-11/+55
| |\ \ \
| | * | | Use AlreadyArchivedError if it's the caseShinya Maeda2018-07-064-8/+8
| | * | | Merge branch 'master' into fix-trace-archive-cron-worker-race-conditionShinya Maeda2018-07-06355-1250/+2197
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Prevent WRITE opetaions if it's already archivedShinya Maeda2018-07-053-2/+27
| | * | | Fix specShinya Maeda2018-07-054-9/+23
| | * | | Rename build to job in ArchiveTraceWorkerShinya Maeda2018-07-051-1/+1
| | * | | Add changelogShinya Maeda2018-07-051-0/+5
| | * | | Check if trace exists before process `archive!` methodShinya Maeda2018-07-053-6/+4
| | * | | Catch ArchiveError and ignore errors if it's already archivedShinya Maeda2018-07-051-1/+3
| * | | | Merge branch 'move-contributing-link-to-partial-for-ee-exclusion' into 'master'Phil Hughes2018-07-062-5/+6
| |\ \ \ \
| | * | | | CE for "Remove new contributing link from EE"Luke Bennett2018-07-062-5/+6
| |/ / / /
| * | | | Merge branch 'fj-43565-wrong-role-displayed' into 'master'Douwe Maan2018-07-068-3/+62
| |\ \ \ \
| | * | | | Fix User role displayed on projects dashboardFrancisco Javier López2018-07-068-3/+62
| |/ / / /
| * | | | Merge branch '31583-osw-gfm-complete-status-indication' into 'master'Sean McGivern2018-07-063-1/+34
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Present state indication on GFM previewOswaldo Ferreira2018-07-053-1/+34
| * | | | Merge branch '48803-mrs-are-showing-some-discussions-as-unresolved' into 'mas...Fatih Acet2018-07-056-12/+41
| |\ \ \ \
| | * | | | Resolve "MRs are showing some discussions as unresolved"Simon Knox2018-07-056-12/+41
| |/ / / /
| * | | | Merge branch 'add-why-gitlab-to-cc-readme' into 'master'Sid Sijbrandij2018-07-051-0/+4
| |\ \ \ \
| | * | | | Update README.mdAndreas Kämmerle2018-07-051-0/+4
| * | | | | Merge branch 'ce-6145-unify-issuable-search-bar' into 'master'Robert Speicher2018-07-053-5/+20
| |\ \ \ \ \
| | * | | | | Bring changes from EELin Jen-Shin2018-07-051-2/+3
| | * | | | | Make sure we're passing the board!Lin Jen-Shin2018-07-051-1/+1
| | * | | | | Board might not existLin Jen-Shin2018-07-051-2/+2
| | * | | | | Unify app/views/shared/issuable/_search_bar.html.hamlLin Jen-Shin2018-07-052-2/+16
| * | | | | | Merge branch '48893-getting-undefined-local-variable-or-method-page-for-error...Robert Speicher2018-07-051-0/+6
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Ensure QA specs are categorized as feature specs by RSpecRémy Coutable2018-07-051-0/+6
| * | | | | | Merge branch 'docs/container-scanning-note' into 'master'Achilleas Pipinellis2018-07-051-2/+2
| |\ \ \ \ \ \
| | * | | | | | Verify version on container scanning noteCindy Pallares 🦉2018-07-051-2/+2
| * | | | | | | Merge branch 'revert-8678cf9b' into 'master'Grzegorz Bizon2018-07-055-8/+123
| |\ \ \ \ \ \ \
| | * | | | | | | Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'master'"Jacob Vosmaer (GitLab)2018-07-055-8/+123
| * | | | | | | | Merge branch 'increase-capybara-js-timeout' into 'master'Robert Speicher2018-07-051-1/+3
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Increase capybara JS request timeoutJacob Vosmaer (GitLab)2018-07-051-1/+3
| |/ / / / / / / /
| * | | | | | | | Merge branch 'go-code-cover' into 'master'Kamil Trzciński2018-07-051-0/+3
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add Go code coverageMaxime Guyot2018-07-041-0/+3
| * | | | | | | | | Merge branch 'gitaly-timeouts' into 'master'Rémy Coutable2018-07-0510-49/+55
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Updated Gitaly timeout valuesAndrew Newdigate2018-07-0510-49/+55
| |/ / / / / / / / /
| * | | | | | | | | Merge branch 'dm-invalid-active-service-template' into 'master'Robert Speicher2018-07-054-3/+8
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Add changelog entryDouwe Maan2018-07-051-0/+5