summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Wait for requests to ensure Download link appearssh-disable-network-service-chromeStan Hu2019-06-031-0/+2
* Disable Google Chrome helper dialogs in testsStan Hu2019-06-031-0/+3
* 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
|\ \ \ \ \ \ \
| * | | | | | | Update invalid anchor linkFabio Pitino2019-06-031-4/+3
|/ / / / / / /
* | | | | | | Merge branch 'patch-64' into 'master'Marcia Ramos2019-06-031-1/+5
|\ \ \ \ \ \ \
| * | | | | | | Fix badly rendered code blocks in JavaScript styleguideOndřej Budai2019-06-011-1/+5
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'tc-db-docs' into 'master'Marcia Ramos2019-06-031-2/+9
|\ \ \ \ \ \ \
| * | | | | | | Add some more database docsToon Claes2019-06-031-2/+9
* | | | | | | | Merge branch 'update-gitlab-runner-helm-chart-to-0-5-2' into 'master'Kamil Trzciński2019-06-032-1/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Update GitLab Runner Helm Chart to 0.5.2update-gitlab-runner-helm-chart-to-0-5-2Tomasz Maczukin2019-06-032-1/+6
* | | | | | | | | Merge branch 'refactor-update-statistics-concern' into 'master'Douglas Barbosa Alexandre2019-06-035-32/+44
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Cleans up UpdateProjectStatistics concernMayra Cabrera2019-06-035-32/+44
|/ / / / / / / / /
* | | | | | | | | Merge branch 'issafeurl-utility' into 'master'Kushal Pandya2019-06-032-0/+120
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add global isSafeURL utilityissafeurl-utilityPaul Gascou-Vaillancourt2019-06-032-0/+120
* | | | | | | | | | Merge branch 'winh-notes-app-jest' into 'master'Clement Ho2019-06-035-109/+114
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Move NoteApp tests to JestWinnie Hellmann2019-06-035-109/+114
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '62092-missing-padding-next-to-time-windows-dropdown-on-metrics-...Clement Ho2019-06-032-1/+6
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Added padding to time window dropdown in monitor dashboardDhiraj Bodicherla2019-06-032-1/+6
|/ / / / / / / / /
* | | | | | | | | Merge dev.gitlab.org master into GitLab.com masterYorick Peterse2019-06-0377-171/+1275
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Merge branch 'security-jej/prevent-web-sign-in-bypass' into 'master'GitLab Release Tools Bot2019-06-033-1/+47
| |\ \ \ \ \ \ \ \