summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Display Ready to Merge widget when MWPS fails40246-mwps-refresh-failureAndré Luís2018-09-052-26/+33
* Merge branch 'application-settings-cleanup' into 'master'Dmitriy Zaporozhets2018-09-041-0/+8
|\
| * Conditional partial rendering for EE in application settingsMartin Wortschack2018-09-041-0/+8
|/
* Merge branch 'rails5-include-opclasses-in-schema-dump' into 'master'Yorick Peterse2018-09-042-19/+36
|\
| * Rails 5: include opclasses in rails 5 schema dumpJasper Maes2018-08-292-19/+36
* | Merge branch 'add-background-migration-for-legacy-traces' into 'master'Kamil Trzciński2018-09-0412-3/+506
|\ \
| * | Squashed commit of the following:add-background-migration-for-legacy-tracesShinya Maeda2018-08-2712-3/+506
* | | Merge branch 'qa-28' into 'master'Grzegorz Bizon2018-09-043-0/+32
|\ \ \
| * | | [QA] Add a new Test::Sanity::Failing scenario that always failsRémy Coutable2018-09-033-0/+32
* | | | Merge branch '50991-qa-page-shared-clonepanel-should-be-moved-to-page-compone...Grzegorz Bizon2018-09-045-7/+12
|\ \ \ \
| * | | | [QA] Move Page::Shared::ClonePanel to Page::Component::ClonePanelRémy Coutable2018-09-035-7/+12
| |/ / /
* | | | Merge branch '39665-restrict-issue-reopen' into 'master'Sean McGivern2018-09-0410-24/+55
|\ \ \ \
| * | | | Restrict reopening locked issues for issue authorsJarka Kadlecová2018-09-0410-24/+55
* | | | | Merge branch 'patch-11' into 'master'Rémy Coutable2018-09-041-2/+5
|\ \ \ \ \
| * | | | | doc/job_traces.md: the file is job.logElan Ruusamäe2018-09-041-2/+5
|/ / / / /
* | | | | Merge branch 'junit-results' into 'master'Rémy Coutable2018-09-045-1/+12
|\ \ \ \ \
| * | | | | Enable JUnit results for rspecKamil Trzciński2018-09-035-2/+13
* | | | | | Merge branch 'sh-send-put-headers-object-storage' into 'master'Nick Thomas2018-09-043-1/+10
|\ \ \ \ \ \
| * | | | | | Send required object storage PUT headers in /uploads/authorize APIStan Hu2018-08-233-1/+10
* | | | | | | Merge branch 'fix-junit-parser' into 'master'Kamil Trzciński2018-09-044-29/+93
|\ \ \ \ \ \ \
| * | | | | | | Fix bugs/edge cases of JUnitParserShinya Maeda2018-09-044-29/+93
|/ / / / / / /
* | | | | | | Merge branch 'rails5-mysql-binary-column-index-length' into 'master'Yorick Peterse2018-09-042-0/+33
|\ \ \ \ \ \ \
| * | | | | | | Rails 5: support schema t.index for mysqlJasper Maes2018-09-032-0/+33
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'fix-wording-in-danger-mr-to-non-master-warning' into 'master'Rémy Coutable2018-09-041-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix wording in Danger warning about MRs to non-masterSean McGivern2018-09-041-1/+1
* | | | | | | | Merge branch '50879-unused-css-container-fluid' into 'master'Dmitriy Zaporozhets2018-09-042-5/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove unused CSS part in mobile frameworkTakuya Noguchi2018-08-302-5/+5
* | | | | | | | | Merge branch 'sh-set-secure-cookies' into 'master'Rémy Coutable2018-09-045-5/+52
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Set issuable_sort and diff_view cookies to secure when possibleStan Hu2018-09-035-5/+52
* | | | | | | | | | Merge branch 'fj-33475-files-inside-wiki-repo' into 'master'Douwe Maan2018-09-0424-85/+906
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Uploads to wiki stored inside the wiki git repositoryFrancisco Javier López2018-09-0424-85/+906
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'sh-fix-object-storage-qa' into 'master'Rémy Coutable2018-09-041-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix QA ObjectStorage not inheriting from Test::Instance::AllStan Hu2018-09-041-1/+1
* | | | | | | | | | Merge branch '_acet-disable-ide-button' into 'master'Tim Zallmann2018-09-044-26/+69
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Disable Web IDE button if user is not allowed to push the source branch.Fatih Acet2018-09-034-26/+69
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '50101-add-artifact-information-to-job-api' into 'master'Kamil Trzciński2018-09-049-8/+137
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add JSON schema validation for job APISteve Azzopardi2018-09-037-6/+61
| * | | | | | | | | Add artifact information for job controllerSteve Azzopardi2018-09-033-3/+77
* | | | | | | | | | Merge branch 'move-cache-vs-artifacts' into 'master'Sid Sijbrandij2018-09-041-57/+58
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Make cache vs artifacts section more visible, and minor enhancements to text.Evan Read2018-09-041-57/+58
* | | | | | | | | | | Merge branch '44750-should-we-still-use-flay' into 'master'Robert Speicher2018-09-047-61/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Stop using FlayRémy Coutable2018-09-037-61/+1
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Only GCPSid Sijbrandij2018-09-031-8/+3
* | | | | | | | | | Merge branch 'bvl-update-install-docs-11-3' into 'master'Achilleas Pipinellis2018-09-032-4/+382
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Update installation and update docs for 11.3Bob Van Landuyt2018-09-032-4/+382
|/ / / / / / / / /
* | | | | | | | | Merge branch 'Ravlen-Repos/gitlab-ee-ee-ce-application-settings-docs' into 'm...Rémy Coutable2018-09-031-102/+134
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update api/settings.mdMarcel Amirault2018-09-031-102/+134
* | | | | | | | | | Merge branch 'winh-move-badge-settings' into 'master'Phil Hughes2018-09-0324-172/+242
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Move badge settings to general settingsWinnie Hellmann2018-09-0324-172/+242
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '6417-extract-ee-specific-files-lines-for-lib-gitlab-email-handl...Douwe Maan2018-09-0312-12/+37
|\ \ \ \ \ \ \ \ \ \