summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add changelogadd-failure-reason-for-execution-timeout-eeShinya Maeda2018-10-101-0/+5
* Squashed commit of the following:Shinya Maeda2018-10-103-3/+6
* Merge branch 'leipert-decouple-security-reports-modal' into 'master'Fatih Acet2018-10-105-357/+225
|\
| * Decouple Security Reports Modal from storeLukas Eipert2018-10-095-357/+225
* | Merge branch 'ce-to-ee-2018-10-10' into 'master'Marin Jankovski2018-10-1023-37/+399
|\ \
| * \ Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-10GitLab Bot2018-10-1023-37/+399
| |\ \
| | * \ Merge branch 'docs/autodevops-enable-auto' into 'master'Marcia Ramos2018-10-101-10/+12
| | |\ \
| | | * | Move the Auto DevOps note to the topAchilleas Pipinellis2018-10-091-10/+12
| | * | | Merge branch 'ml-qa-add-file-templates' into 'master'Sean McGivern2018-10-1021-26/+377
| | |\ \ \
| | | * | | Add tests of adding file templatesMark Lapierre2018-10-0921-26/+377
| | * | | | Merge branch 'jej/inline-rspec-filepath-cop' into 'master'Rémy Coutable2018-10-101-1/+10
| | |\ \ \ \
| | | * | | | Inline RSpec/FilePath rubocop ruleJames Edwards-Jones2018-10-091-1/+10
* | | | | | | Merge branch 'use-fetch-head-for-upgrade-migration' into 'master'Rémy Coutable2018-10-101-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Checking out to FETCH_HEAD works better with tagsLin Jen-Shin2018-10-101-3/+3
* | | | | | | | Merge branch 'docs/instance-template-refactor' into 'master'Marcia Ramos2018-10-106-30/+31
|\ \ \ \ \ \ \ \
| * | | | | | | | Refactor the instance-wide custom templates docsAchilleas Pipinellis2018-10-096-30/+31
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch '6709-group-security-dashboard-api-poc' into 'master'Kamil Trzciński2018-10-1030-51/+882
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | API endpoints for Group-level Security DashboardFabien Catteau2018-10-1030-51/+882
|/ / / / / / /
* | | | | | | Merge branch 'ce-to-ee-2018-10-10' into 'master'Stan Hu2018-10-101-6/+6
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-10GitLab Bot2018-10-101-6/+6
| |\ \ \ \ \ \ |/ / / / / / / | | | _ / / / | | | / / /
| * | | | | Merge branch 'priority-bug-sla-clarity' into 'master'Mek Stittri2018-10-101-6/+6
| |\ \ \ \ \
| | * | | | | Clarify SLA for defectsMek Stittri2018-10-091-6/+6
* | | | | | | Merge branch 'ce-to-ee-2018-10-09' into 'master'Robert Speicher2018-10-091-2/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-09GitLab Bot2018-10-091-2/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch 'patch-28' into 'master'Achilleas Pipinellis2018-10-091-2/+1
| | |\ \ \ \ \ \
| | | * | | | | | Remove duplicated item in Administration DocumentationMichael Bisbjerg2018-10-091-2/+1
| | |/ / / / / /
* | | | | | | | Merge branch 'rails5-epic-finder-fix' into 'master'Douglas Barbosa Alexandre2018-10-092-1/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Rails5: Fix epics finder count_key methodJasper Maes2018-10-092-1/+11
|/ / / / / / /
* | | | | | | Merge branch 'ce-to-ee-2018-10-09' into 'master'Robert Speicher2018-10-0913-67/+91
|\ \ \ \ \ \ \
| * | | | | | | Resolve conflict in qa/qa/page/admin/menu.rbWinnie Hellmann2018-10-091-3/+0
| * | | | | | | Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-09GitLab Bot2018-10-0914-67/+94
| |\ \ \ \ \ \ \ |/ / / / / / / / | | _ / / / / / | | / / / / /
| * | | | | | Merge branch 'gt-update-wiki-empty-state' into 'master'Fatih Acet2018-10-092-1/+6
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Update wiki empty stateGeorge Tsiolis2018-10-092-1/+6
| * | | | | | Merge branch 'qa-60-reorganize-menu-classes' into 'master'Rémy Coutable2018-10-0935-60/+66
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Reorganize menu filesqa-60-reorganize-menu-classes-squash-trysliaquat2018-10-0935-60/+66
| * | | | | | Merge branch '52399-link-for-rbac-experimental-support-is-going-to-the-wrong-...Mike Greiling2018-10-092-2/+2
| |\ \ \ \ \ \
| | * | | | | | Fix anchor for RBAC support help linkThong Kuah2018-10-092-2/+2
| * | | | | | | Merge branch '52367-cleanup-web-hooks-columns' into 'master'Rémy Coutable2018-10-095-37/+31
| |\ \ \ \ \ \ \
| | * | | | | | | Remove unencrypted webhook token and URL columnsNick Thomas2018-10-095-37/+31
| * | | | | | | | Merge branch '52372-pipeline-s-page-shows-vue-error-on-master' into 'master'Mike Greiling2018-10-092-2/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Resolve "pipeline's page shows vue error on master"Filipa Lacerda2018-10-092-2/+2
| |/ / / / / / / /
| * | | | | | | | Merge branch 'patch-29' into 'master'Rémy Coutable2018-10-091-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Update README.mdpockata2018-10-081-1/+1
| | |/ / / / / / /
| * | | | | | | | Merge branch '52233-harmonize-eslint-prettier' into 'master'Fatih Acet2018-10-0966-115/+93
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Resolve "Harmonize prettier and eslint configs"Mike Greiling2018-10-0966-115/+93
| |/ / / / / / / /
| * | | | | | | | Merge branch 'improve-downstream-pipeline-trigger' into 'master'Nick Thomas2018-10-091-24/+49
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Improve downstream pipeine trigger classRémy Coutable2018-10-081-24/+49
* | | | | | | | | | Merge branch 'fix-spec-typo' into 'master'Douglas Barbosa Alexandre2018-10-091-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix a typo in a spec fileNick Thomas2018-10-091-2/+2
* | | | | | | | | | | Merge branch '7938-runners-bug' into 'master'Tim Zallmann2018-10-094-1/+78
|\ \ \ \ \ \ \ \ \ \ \