summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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 '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
|\ \ \ \ \
| * | | | | Improve code review section in MR templates. refs #46297Olivier Gonzalez2018-05-111-3/+3
* | | | | | Merge branch 'zj-verbose-logging-deprecation-stack' into 'master'Douwe Maan2018-05-141-2/+6
|\ \ \ \ \ \
| * | | | | | More verbose logging for deprecated path accessZeger-Jan van de Weg2018-05-141-2/+6
| |/ / / / /
* | | | | | Merge branch 'sh-fix-cross-site-origin-uploads-js' into 'master'Rémy Coutable2018-05-143-0/+24
|\ \ \ \ \ \
| * | | | | | Fix cross-origin errors when attempting to download JavaScript attachmentsStan Hu2018-05-133-0/+24
| |/ / / / /
* | | | | | Merge branch 'update-sidekiq' into 'master'Rémy Coutable2018-05-142-4/+4
|\ \ \ \ \ \
| * | | | | | update sidekiq 5.0 -> 5.1Pirate Praveen2018-05-052-4/+4
* | | | | | | Merge branch 'blackst0ne-rails5-fix-spec-models-ci-pipeline_spec-rb' into 'ma...Kamil Trzciński2018-05-141-1/+11
|\ \ \ \ \ \ \
| * | | | | | | [Rails5] Fix Ci::Pipeline validator for sourceblackst0ne-rails5-fix-spec-models-ci-pipeline_spec-rbblackst0ne2018-05-121-1/+11
* | | | | | | | Merge branch 'bvl-fix-typo-on-help-page-docs' into 'master'Achilleas Pipinellis2018-05-141-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Change `expect` to `except` on help pageBob Van Landuyt2018-05-141-1/+1
* | | | | | | | | Merge branch '45462-sha-object' into 'master'Phil Hughes2018-05-145-139/+92
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix broken testsFilipa Lacerda2018-05-111-1/+1
| * | | | | | | | | Fixes eslintFilipa Lacerda2018-05-101-36/+37
| * | | | | | | | | Moves mr widget to a vue componentFilipa Lacerda2018-05-105-105/+57
* | | | | | | | | | Merge branch 'kp-add-vue-create-component-helper' into 'master'Filipa Lacerda2018-05-141-3/+19
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add `createComponentWithMixin` to create anonymous components with mixinKushal Pandya2018-05-141-3/+19
* | | | | | | | | | | Merge branch 'sh-fix-blocked-user-account-ldap' into 'master'Douwe Maan2018-05-143-18/+35
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix system hook not firing for blocked users when LDAP sign-in is usedStan Hu2018-05-123-18/+35
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'fix/secpick-script' into 'master'James Lopez2018-05-141-3/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update secpickJames Lopez2018-05-141-1/+1
| * | | | | | | | | | | Update secpickJames Lopez2018-05-141-1/+1
| * | | | | | | | | | | Update secpick to use security branchesJames Lopez2018-05-141-2/+1
* | | | | | | | | | | | Merge branch 'docs/rs-code-review' into 'master'Douwe Maan2018-05-142-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add Code Review documentation that maintainers also perform code reviewdocs/rs-code-reviewRobert Speicher2018-05-111-0/+4
| * | | | | | | | | | | | Move footnote from CONTRIBUTING.md to doc/development/code_review.mdRobert Speicher2018-05-112-3/+1