summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Added regression testfj-45616-wiki-invalid-utf8-sequenceFrancisco Javier López2018-05-151-0/+6
* Merge branch '31662-remove-squashed-related-commits-together-from-default-mr-...Grzegorz Bizon2018-05-151-1/+3
|\
| * Improve the squash step in the 'Database Changes' MR template31662-remove-squashed-related-commits-together-from-default-mr-templateRémy Coutable2018-05-151-1/+3
* | Merge branch 'jprovazn-null-byte' into 'master'Rémy Coutable2018-05-153-1/+18
|\ \
| * | Disable greedy mode when matching filenameJan Provaznik2018-05-153-1/+18
|/ /
* | Merge branch 'blackst0ne-remove-spinach' into 'master'Rémy Coutable2018-05-1549-2332/+135
|\ \
| * | Update Gemfile.rails5.lockblackst0ne-remove-spinachblackst0ne2018-05-141-17/+0
| * | Remove /featuresblackst0ne2018-05-1432-1989/+0
| * | Increase rspec jobs up to 30blackst0ne2018-05-141-115/+123
| * | Fix specsblackst0ne2018-05-141-0/+9
| * | Add changelog entry [ci skip]blackst0ne2018-05-141-0/+5
| * | Revert clean up `db/fixtures/development/14_pipelines.rb`blackst0ne2018-05-141-0/+4
| * | Clean up test.rakeblackst0ne2018-05-141-1/+0
| * | Remove spinach.rakeblackst0ne2018-05-141-60/+0
| * | Clean up spec/support/gitlab_stubs/gitlab_ci.ymlblackst0ne2018-05-141-9/+0
| * | Clean up 14_pipelines.rbblackst0ne2018-05-141-4/+0
| * | Clean up docsblackst0ne2018-05-148-47/+6
| * | Clean up gitlab-ci.ymlblackst0ne2018-05-141-57/+1
| * | Remove bin/spinachblackst0ne2018-05-141-13/+0
| * | Clean up Gemfileblackst0ne2018-05-142-20/+0
| * | Clean up `notes_controller`blackst0ne2018-05-141-13/+0
* | | Merge branch 'ce-5968-extract-ee-specific-files-lines-for-clusters-related-fi...Kamil Trzciński2018-05-154-65/+65
|\ \ \
| * | | Extract shared components from Clusters::CreateService specMatija Čupić2018-05-132-63/+62
| * | | Add missing spec line from EEMatija Čupić2018-05-131-0/+1
| * | | Backport cluster factory changes from EEMatija Čupić2018-05-131-2/+2
* | | | Merge branch '46286-fix-ingress-rbac-default-value' into 'master'Kamil Trzciński2018-05-152-0/+10
|\ \ \ \ | |_|_|/ |/| | |
| * | | Changes Ingress RBAC value to be false as defaultMayra Cabrera2018-05-142-0/+10
* | | | Merge branch 'update-wiki-modal' into 'master'Tim Zallmann2018-05-155-3/+121
|\ \ \ \
| * | | | Changed copy of delete button to sentence caseConstance Okoghenun2018-05-071-2/+2
| * | | | Made delete wiki modal component props required and changed the component ini...Constance Okoghenun2018-05-072-21/+26
| * | | | Removed quotes around page titleConstance Okoghenun2018-05-071-2/+2
| * | | | Added changelog for New design for wiki page deletion confirmationConstance Okoghenun2018-05-071-0/+5
| * | | | Fixed linit errorsConstance Okoghenun2018-05-073-23/+23
| * | | | Added modal message and removed traget branch and commit message fields for d...Constance Okoghenun2018-05-071-40/+10
| * | | | Updated user delete wiki specConstance Okoghenun2018-05-041-2/+3
| * | | | Added commit form fields for delete page confirmationConstance Okoghenun2018-05-033-12/+56
| * | | | Changed delete wiki prompt from 'confirm' for 'gl_modal'Constance Okoghenun2018-05-033-2/+95
* | | | | Merge branch 'jprovazn-pipeline-policy' into 'master'Douwe Maan2018-05-1510-12/+96
|\ \ \ \ \
| * | | | | Enable update_(build|pipeline) for maintainersJan Provaznik2018-05-1510-12/+96
|/ / / / /
* | | | | Merge branch 'docs-fix-mr-link-maintainer-pushes' into 'master'Achilleas Pipinellis2018-05-151-0/+2
|\ \ \ \ \
| * | | | | Fix link to MR for Maintainer Access docsMark Fletcher2018-05-141-0/+2
* | | | | | Merge branch 'docs-typo-main-page' into 'master'Achilleas Pipinellis2018-05-150-0/+0
|\ \ \ \ \ \
| * | | | | | Fix minor typo of main docs pageMark Fletcher2018-05-141-1/+1
| |/ / / / /
* | | | | | Merge branch '46345-kubernetes-popover-illustration-skewed' into 'master'Filipa Lacerda2018-05-143-4/+9
|\ \ \ \ \ \
| * | | | | | Correct skewed Kubernetes popover illustrationLukas Eipert2018-05-143-4/+9
|/ / / / / /
* | | | | | Merge branch 'refactor/move-squash-before-merge-vue-component' into 'master'Phil Hughes2018-05-143-4/+9
|\ \ \ \ \ \
| * | | | | | Move SquashBeforeMerge vue componentGeorge Tsiolis2018-05-083-4/+9
* | | | | | | Merge branch 'backstage/gb/backport-untrusted-regexp-ee-code' into 'master'Rémy Coutable2018-05-142-1/+26
|\ \ \ \ \ \ \
| * | | | | | | Backport EE-specific untrusted regexp implementationGrzegorz Bizon2018-05-142-1/+26
* | | | | | | | Merge branch '46297_improve_code_review_section_in_mr_templates' into 'master'Rémy Coutable2018-05-141-3/+3
|\ \ \ \ \ \ \ \