summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sh-fix-recaptcha-test' into 'master'10-6-stable-patch-4Stan Hu2018-04-092-4/+1
* Fix broken eslint rule in spec/javascripts/notes/components/noteable_discussi...Filipa Lacerda2018-04-091-1/+1
* Merge branch '45070-prometheus-integration-via-kubernetes-is-broken' into 'ma...Kamil Trzciński2018-04-092-0/+6
* Merge branch 'issue_44551' into 'master'Sean McGivern2018-04-097-8/+69
* Merge branch 'fix/sm/fix-wrong-error-handling-in-update-page-service' into 'm...Kamil Trzciński2018-04-092-11/+48
* Merge branch 'sh-cleanup-pages-worker' into 'master'Nick Thomas2018-04-092-0/+8
* Merge branch 'fix/gb/fix-background-pipeline-stages-migration' into 'master'Kamil Trzciński2018-04-094-1/+26
* Merge branch 'jivl-change-copy-text-promote-milestones-labels' into 'master'Sean McGivern2018-04-0914-12/+45
* Merge branch '44717-no-resolve-issue' into 'master'Fatih Acet2018-04-093-7/+22
* Merge branch 'docs-fix_code_quality_example_documentation' into 'master'Achilleas Pipinellis2018-04-091-6/+1
* Merge branch '44649-reference-parsing-conflicting-with-auto-linking' into 'ma...Douwe Maan2018-04-093-2/+20
* Merge branch '43794-fix-domain-verification-validation-errors' into 'master'Grzegorz Bizon2018-04-093-3/+31
* Merge branch 'dm-refs-contains-sha-encoding' into 'master'Sean McGivern2018-04-093-2/+11
* Merge branch '5347-fix-multiple-clusters-incorrect-details-injected' into 'ma...Kamil Trzciński2018-04-097-12/+26
* Update VERSION to 10.6.3v10.6.3Filipa Lacerda2018-04-031-1/+1
* Update CHANGELOG.md for 10.6.3Filipa Lacerda2018-04-033-10/+8
* Merge branch 'jej/mattermost-notification-confidentiality-10-6' into 'securit...Douwe Maan2018-04-0335-21/+498
* Merge branch '42028-xss-diffs-10-6' into 'security-10-6'Douwe Maan2018-04-033-4/+38
* Merge branch 'fl-fix-milestone-bug-10-6' into 'security-10-6'Phil Hughes2018-04-032-4/+21
* Update VERSION to 10.6.2v10.6.2Filipa Lacerda2018-03-291-1/+1
* Update CHANGELOG.md for 10.6.2Filipa Lacerda2018-03-293-10/+8
* Merge branch 'cherry-pick-058dd1' into '10-6-stable'Marin Jankovski2018-03-293-13/+15
|\
| * Merge branch '44587-autolinking-includes-trailing-exclamation-marks' into 'ma...cherry-pick-058dd1Robert Speicher2018-03-293-13/+15
* | Merge branch 'cherry-pick-ab8f13c3' into '10-6-stable'Marin Jankovski2018-03-296-22/+28
|\ \ | |/ |/|
| * Merge branch 'fix/ldap_wihtout_user' into 'master'cherry-pick-ab8f13c3Douwe Maan2018-03-296-22/+28
|/
* Update VERSION to 10.6.1v10.6.1Filipa Lacerda2018-03-271-1/+1
* Update CHANGELOG.md for 10.6.1Filipa Lacerda2018-03-276-25/+20
* Merge branch '10-6-stable-patch-1' into '10-6-stable'James Lopez2018-03-272-1/+6
|\
| * Merge branch 'bug/44103-ie11-compatibility' into 'master'10-6-stable-patch-1Fatih Acet2018-03-261-0/+1
| * Merge branch 'docs/rs-update-changelog' into 'master'Douwe Maan2018-03-261-1/+5
|/
* Merge branch '10-6-stable-patch-1' into '10-6-stable'Robert Speicher2018-03-2331-60/+957
|\
| * Merge branch '44564-error-500-while-attempting-to-resolve-conflicts-due-to-ut...Stan Hu2018-03-237-17/+73
| * Merge branch 'fix/encoding-helper-clean-blowing-up-on-utf-16be' into 'master'Robert Speicher2018-03-232-1/+6
| * Merge branch 'sh-update-loofah' into 'master'Robert Speicher2018-03-233-5/+12
| * Merge branch 'docs/ci-caching' into 'master'Marcia Ramos2018-03-234-22/+702
| * Merge branch 'fix-ci-job-auto-retry' into 'master'Grzegorz Bizon2018-03-233-1/+39
| * Merge branch 'ee-5063-to-ce-backport' into 'master'Douwe Maan2018-03-233-5/+5
| * Merge branch 'ab-44446-add-indexes-for-user-activity-queries' into 'master'Yorick Peterse2018-03-233-1/+48
| * Merge branch 'jramsay-maintainers-can-edit-docs' into 'master'Marcia Ramos2018-03-231-4/+9
| * Merge branch 'update-cloud-native-chart-docs' into 'master'Marcia Ramos2018-03-231-2/+2
| * Merge branch '44232-docs-for-runner-ip-address' into 'master'Kamil Trzciński2018-03-234-0/+38
| * Merge branch 'fix/sm/erase_old_trace' into 'master'Kamil Trzciński2018-03-232-2/+23
* | Update VERSION to 10.6.0v10.6.0James Lopez2018-03-221-1/+1
* | Update CHANGELOG.md for 10.6.0James Lopez2018-03-22170-845/+184
|/
* Merge branch 'sh-lograge-strip-location-header' into 'master'Robert Speicher2018-03-211-0/+18
* Update VERSION to 10.6.0-rc7v10.6.0-rc7James Lopez2018-03-201-1/+1
* Merge branch '10-6-stable-prepare-rc7' into '10-6-stable'Robert Speicher2018-03-1952-326/+730
|\
| * Merge branch 'jl-add-custom-metrics-docs' into 'master'Marcia Ramos2018-03-191-13/+17
| * Merge branch '44330-docs-for-ingress-ip' into 'master'Achilleas Pipinellis2018-03-192-0/+34
| * Merge branch 'sh-admin-projects-remove-n-plus-one' into 'master'Robert Speicher2018-03-192-0/+11