summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* bring back debaggable fixturestest-reports-on-merge-requestShinya Maeda2018-08-0617-29/+111
* Merge branch '6860-FE-instance-level-project-templates' into 'master'Tim Zallmann2018-08-0510-52/+79
|\
| * backport changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/...Lukas Eipert2018-08-0310-52/+79
* | Merge branch 'mg-revert-unneeded-changes-protected-environments' into 'master'Fatih Acet2018-08-031-14/+2
|\ \
| * | revert changes from gitlab-org/gitlab-ce!21018Mike Greiling2018-08-031-14/+2
|/ /
* | Merge branch '2747-protected-environments-frontend' into 'master'Fatih Acet2018-08-033-19/+41
|\ \
| * | Port of protected environments frontend changes from EE to CEMike Greiling2018-08-033-19/+41
|/ /
* | Merge branch 'ccr/group_milestone_on_dashboard' into 'master'Kamil Trzciński2018-08-039-5/+87
|\ \
| * | Add group milestones to dashboard milestone pageChantal Rollison2018-08-039-5/+87
|/ /
* | Merge branch '47548-monospace-commit-messages' into 'master'Mike Greiling2018-08-035-17/+28
|\ \
| * | Update commit description border and paddingPaul Slaughter2018-08-031-2/+2
| * | Update commit description styles to monospace font and overflow-xPaul Slaughter2018-08-035-17/+24
| * | Port EE lines into CE for commits.scssPaul Slaughter2018-08-031-0/+4
* | | Merge branch 'artifact-format-v2-with-parser' into 'master'Kamil Trzciński2018-08-0358-9/+8338
|\ \ \ | |/ / |/| |
| * | Remove binding.pryShinya Maeda2018-08-041-1/+0
| * | Wraps lines which over 80 charsShinya Maeda2018-08-031-1/+6
| * | Fix specShinya Maeda2018-08-032-2/+2
| * | Add spec for parsers factoryShinya Maeda2018-08-031-0/+23
| * | Add factory for parsers. Add required specification in json schema matcher. I...Shinya Maeda2018-08-0312-108/+110
| * | Fix merge request controller spec because to as_jsonShinya Maeda2018-08-031-1/+1
| * | Remove frontend changesShinya Maeda2018-08-033-12/+2
| * | Fix static analysysShinya Maeda2018-08-031-2/+2
| * | Use serializable_hash for compared resultsShinya Maeda2018-08-032-2/+2
| * | Fix existing key logic in test suiteShinya Maeda2018-08-031-2/+2
| * | Added unique identifier to calculate_reactive_cache. Decoupled comparison log...Shinya Maeda2018-08-037-35/+102
| * | Merge branch 'master-ce' into artifact-format-v2-with-parserShinya Maeda2018-08-03227-656/+1505
| |\ \
| * | | Simplify the query to fetch base and head pipelinesShinya Maeda2018-08-021-5/+2
| * | | Set polling interval to the header in test_reports endpointShinya Maeda2018-08-021-0/+2
| * | | Fix fixture path in runner specShinya Maeda2018-08-021-2/+2
| * | | Fix fixtures and factoryShinya Maeda2018-08-023-2/+2
| * | | Add changelogShinya Maeda2018-08-021-0/+5
| * | | Decouple fixture seeds changeShinya Maeda2018-08-0211-65/+24
| * | | Squashed commit of the following:Shinya Maeda2018-08-0264-29/+8309
* | | | Merge branch 'rails5-update-rouge' into 'master'Rémy Coutable2018-08-032-1/+6
|\ \ \ \
| * | | | Rails5: update Rails5 lock for forgotten gem rougeJasper Maes2018-08-032-1/+6
|/ / / /
* | | | Merge branch 'patch-28' into 'master'Rémy Coutable2018-08-031-0/+1
|\ \ \ \
| * | | | Update proofreader.mdEmily2018-08-021-0/+1
* | | | | Merge branch '46940-hashed-storage-extend-enable-hashed-storage-for-all-new-p...Douglas Barbosa Alexandre2018-08-0317-105/+174
|\ \ \ \ \
| * | | | | Resolve "Hashed storage: extend "Enable hashed storage for all new projects" ...Valery Sizov2018-08-0317-105/+174
|/ / / / /
* | | | | Merge branch '49776-pipeline-job-log-page-uses-too-much-cpu-for-loading-anima...Annabel Gray2018-08-035-20/+49
|\ \ \ \ \
| * | | | | Resolve "Pipeline job log page uses too much CPU for loading animation"Dennis Tang2018-08-035-20/+49
|/ / / / /
* | | | | Merge branch 'frozen-string-enable-app-models-more' into 'master'Rémy Coutable2018-08-0379-0/+161
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Enable frozen string for app/models/**/*.rbrepo-forks/gitlab-ce-frozen-string-enable-app-models-moregfyoung2018-08-0379-0/+161
* | | | | Merge branch '45318-junit-FE' into 'master'Phil Hughes2018-08-0334-17/+1100
|\ \ \ \ \
| * | | | | Adds action spec to cover 204Filipa Lacerda2018-08-032-7/+21
| * | | | | Changes after review:Filipa Lacerda2018-08-0214-62/+67
| * | | | | Ports EE only CSS into CEFilipa Lacerda2018-08-021-0/+1
| * | | | | Adds frontend support to render test reports on theMR widgetFilipa Lacerda2018-08-0233-4/+1067
* | | | | | Merge branch 'fix/import-templates-spec' into 'master'Sean McGivern2018-08-032-1/+1
|\ \ \ \ \ \
| * | | | | | Fix spec warnings and template helperJames Lopez2018-08-032-1/+1