summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Document the Admin Area's *Gitaly Servers* pagedocs/admin_area_gitaly_serversRussell Dickenson2019-06-041-1/+18
* Merge branch 'docs-herokuish-instead-of-bin-setup' into 'master'Evan Read2019-06-031-7/+8
|\
| * Use /bin/herokuish in Auto DevOps docs examplesdocs-herokuish-instead-of-bin-setupDylan Griffith2019-06-031-7/+8
* | Merge branch 'ce-nfriend-no-implicit-coercion-fixes' into 'master'Mike Greiling2019-06-0350-71/+76
|\ \
| * | Comply with `no-implicit-coercion` rule (CE)Nathan Friend2019-06-0350-71/+76
|/ /
* | Merge branch '61264-dast-report-error' into 'master'Mayra Cabrera2019-06-031-36/+38
|\ \
| * | Backporting EE fixrossfuhrman2019-06-031-36/+38
|/ /
* | Merge branch 'winh-boardsStore.moving' into 'master'Mike Greiling2019-06-033-2/+21
|\ \
| * | Move boardsStore.moving to BoardList componentWinnie Hellmann2019-06-033-2/+21
|/ /
* | Merge branch 'selfmanaged-gitlabcom-import-update-docs' into 'master'Drew Blessing2019-06-031-2/+3
|\ \
| * | Clarify "support" to mean GitLab.com integrationGreg Myers2019-06-031-2/+3
|/ /
* | Merge branch 'qa-log-out-in-after-all-hook' into 'master'Dan Davison2019-06-031-0/+2
|\ \
| * | Log out in after all hookqa-log-out-in-after-all-hookMark Lapierre2019-05-311-0/+2
* | | Merge branch 'tc-db-explain-analyze' into 'master'Kamil TrzciƄski2019-06-033-0/+34
|\ \ \
| * | | Add activerecord-explain-analyze gemToon Claes2019-06-033-0/+34
* | | | Merge branch 'qa-tentative-to-de-quarantine-e2e-test' into 'master'Dan Davison2019-06-031-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Backport EE MRqa-tentative-to-de-quarantine-e2e-testWalmyr Lima2019-06-031-1/+1
* | | | Merge branch 'lm-update-mermaid-arch' into 'master'Achilleas Pipinellis2019-06-031-1/+1
|\ \ \ \
| * | | | Update architecture.md to fix typo in GitLabMonito -> GitLabMonitorLee Matos2019-06-031-1/+1
|/ / / /
* | | | Merge branch 'sh-resolve-member-presenter-conflicts' into 'master'Robert Speicher2019-06-032-1/+17
|\ \ \ \
| * | | | Reconcile CE and EE differences in members/_member.html.hamlsh-resolve-member-presenter-conflictsStan Hu2019-06-012-1/+17
* | | | | Merge branch 'zj-bump-gitaly-master' into 'master'Mayra Cabrera2019-06-034-7/+7
|\ \ \ \ \
| * | | | | Bump Gitaly version to 1.44.0Douwe Maan2019-06-034-7/+7
|/ / / / /
* | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRobert Speicher2019-06-039-3/+96
|\ \ \ \ \
| * \ \ \ \ Merge branch 'security-60143-address-xss-issue-master' into 'master'Robert Speicher2019-06-033-0/+55
| |\ \ \ \ \
| | * | | | | Reject slug+uri concat if slug is deemed unsafeKerri Miller2019-05-243-0/+55
| * | | | | | Merge branch 'security-58856-persistent-xss-in-note-objects' into 'master'Robert Speicher2019-06-036-3/+41
| |\ \ \ \ \ \
| | * | | | | | Remove unused fixture linesTiger2019-05-281-2/+0
| | * | | | | | Change `prohibited_key` to use regexescharlieablett2019-05-011-4/+2
| | * | | | | | Add `html` to sensitive wordscharlieablett2019-05-013-3/+4
| | * | | | | | Remove accidental regressionscharlieablett2019-04-301-5/+6
| | * | | | | | Ensure Issue & MR note_html cannot be importedAsh McKenzie2019-04-302-16/+16
| | * | | | | | Refactor `attribute_cleaner` for readabilitycharlieablett2019-04-301-1/+3
| | * | | | | | Further clarify `attribute_cleaner`charlieablett2019-04-291-10/+4
| | * | | | | | Tighten up prohibited_key methodcharlieablett2019-04-261-3/+2
| | * | | | | | Use English instead of LatinCharlie Ablett2019-04-251-2/+2
| | * | | | | | Add disallowed fields to AttributeCleanercharlieablett2019-04-244-14/+21
| | * | | | | | Re-stub stubbed method callscharlieablett2019-04-231-3/+9
| | * | | | | | Add changelog entrycharlieablett2019-04-231-0/+5
| | * | | | | | Exclude fields from note importcharlieablett2019-04-233-2/+29
* | | | | | | | Merge branch 'osw-sync-merge-ref-upon-mergeability-check' into 'master'Douwe Maan2019-06-0314-222/+380
|\ \ \ \ \ \ \ \
| * | | | | | | | Add payload to the service responseOswaldo Ferreira2019-05-316-16/+152
| * | | | | | | | Simplify merge_ref_head methodsOswaldo Ferreira2019-05-313-9/+7
| * | | | | | | | Automatically update MR merge-ref along merge statusOswaldo Ferreira2019-05-3112-215/+239
* | | | | | | | | Merge branch '58269-separate-update-patch' into 'master'Mike Greiling2019-06-0310-235/+413
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add new externalized strings58269-separate-update-patchEnrique Alcantara2019-05-301-3/+6
| * | | | | | | | | Add changelog entryEnrique Alcantara2019-05-301-0/+5
| * | | | | | | | | Add updateSuccessful/Failed props to knative appEnrique Alcantara2019-05-303-27/+37
| * | | | | | | | | Extract knative domain editor into a componentEnrique Alcantara2019-05-305-205/+365
* | | | | | | | | | Merge branch 'fp-update-invalid-anchor-link' into 'master'Marcia Ramos2019-06-031-4/+3
|\ \ \ \ \ \ \ \ \ \