summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update VERSION to 10.3.9v10.3.910-3-stableMark Fletcher2018-03-161-1/+1
* Update CHANGELOG.md for 10.3.9Mark Fletcher2018-03-164-15/+9
* Merge branch '10-3-stable-patch-9' into '10-3-stable'Mark Fletcher2018-03-1648-132/+547
|\
| * Merge branch 'fix/auth0-unsafe-login-10-3' into 'security-10-3'James Lopez2018-03-168-50/+134
| * Merge branch 'fj-15329-services-callbacks-ssrf-10-3' into 'security-10-3'Douwe Maan2018-03-1640-82/+413
|/
* Merge branch '10-3-stable' of gitlab.com:gitlab-org/gitlab-ce into dev-10-3-s...James Lopez2018-03-063-3/+8
|\
| * Merge branch '42591-update-nokogiri' into 'master'Stan Hu2018-02-073-3/+8
* | Update VERSION to 10.3.8v10.3.8Robert Speicher2018-03-011-1/+1
* | Update CHANGELOG.md for 10.3.8Robert Speicher2018-03-012-5/+7
* | Merge branch '10-3-stable-patch-8' into '10-3-stable'Robert Speicher2018-03-014-1/+19
|\ \ | |/ |/|
| * Merge branch 'pages-6-1-gitlab-10-3' into 'security-10-3'Marin Jankovski2018-02-271-1/+1
| * Merge branch 'sh-fix-otp-backup-invalidation-10-3' into 'security-10-3'Douwe Maan2018-02-273-0/+18
|/
* Update VERSION to 10.3.7v10.3.7Luke Bennett2018-02-051-1/+1
* Update CHANGELOG.md for 10.3.7Luke Bennett2018-02-055-20/+10
* Merge branch 'mc/bug/38984-wildcard-protected-tags-10-3' into 'security-10-3'Kamil Trzciński2018-02-027-9/+40
* Fix stored XSS in code blocksSean McGivern2018-02-013-15/+81
* Merge branch 'fix-mermaid-xss-10-3' into 'security-10-3'Sean McGivern2018-02-017-0/+59
* Merge branch 'fix/gh-namespace-issue-10-3' into 'security-10-3'James Lopez2018-01-317-30/+88
* Merge branch 'security-10-3-todo-api-reveals-sensitive-information' into 'sec...Robert Speicher2018-01-315-2/+19
* Merge branch 'security-10-3-25223-snippets-finder-doesnt-obey-feature-visibil...Douwe Maan2018-01-319-75/+410
* Update VERSION to 10.3.6v10.3.6Oswaldo Ferreira2018-01-221-1/+1
* Update CHANGELOG.md for 10.3.6Oswaldo Ferreira2018-01-2218-86/+23
* Merge branch '10-3-stable-patch-6' into '10-3-stable'Oswaldo Ferreira2018-01-2279-243/+924
|\
| * Remove failing spec not needed for 10.310-3-stable-patch-6Jarka Kadlecová2018-01-221-12/+0
| * Backport Gitlab::Git::Repository#create_hooks and fix conflictsStan Hu2018-01-194-5/+77
| * Resolve incorrect conflict resolution for dispatcher cluster pagesEric Eastwood2018-01-191-3/+6
| * Change FactoryBot to FactoryGirlTiago Botelho2018-01-191-1/+1
| * Merge branch 'fix-docs-help-shortcut' into 'master'Phil Hughes2018-01-196-4/+53
| * Merge branch '41342-add-ci-yml-example-for-browser-performance-testing-in-ce'...Marcia Ramos2018-01-191-0/+50
| * Merge branch 'docs-move-transfer-project-to-group' into 'master'Achilleas Pipinellis2018-01-195-63/+174
| * Merge branch 'docs-clarify-auto-devops-pipelines' into 'master'Achilleas Pipinellis2018-01-192-15/+8
| * Merge branch 'sh-catch-invalid-uri-markdown' into 'master'Robert Speicher2018-01-193-1/+11
| * Merge branch 'fix-abuse-reports-link-url' into 'master'Robert Speicher2018-01-192-1/+6
| * Merge branch 'pawel/update-prometheus-gem-to-improve-handling-of-inf-bucket' ...Douwe Maan2018-01-192-3/+3
| * Merge branch 'sh-validate-path-project-import' into 'master'Yorick Peterse2018-01-193-10/+25
| * Merge branch '41396-ee_compat_check-and-security-fix-development' into 'master'Rémy Coutable2018-01-191-0/+1
| * Merge branch '41677-branch-name-omitted-due-to-bad-utf-8-conversion-by-gitaly...Stan Hu2018-01-193-11/+35
| * Merge branch '41468-error-500-trying-to-view-a-merge-request-json-undefined-m...Douwe Maan2018-01-193-8/+53
| * Merge branch 'changes-dropdown-ellipsis' into 'master'Sean McGivern2018-01-194-1/+23
| * Merge branch '41424-gitlab-rake-gitlab-import-repos-schedules-an-import' into...Douwe Maan2018-01-196-7/+28
| * Merge branch 'fj-41477-fix-bug-wiki-last-version' into 'master'Douwe Maan2018-01-194-0/+91
| * Merge branch 'mk-no-op-delete-conflicting-redirects' into 'master'Douwe Maan2018-01-195-88/+17
| * Merge branch '41563-fix-branch-creation-from-issue-in-firefox' into 'master'Fatih Acet2018-01-191-4/+4
| * Merge branch 'sh-fix-bare-import-hooks' into 'master'James Lopez2018-01-195-3/+47
| * Merge branch '41491-fix-nil-blob-name-error' into 'master'Annabel Dunstone Gray2018-01-195-5/+33
| * Merge branch 'fj-41598-fixing-request-mime-type' into 'master'Douwe Maan2018-01-193-3/+16
| * Merge branch 'mk-fix-permanent-redirect-validation' into 'master'Douwe Maan2018-01-194-1/+81
| * Merge branch '41727-target-branch-name' into 'master'Sean McGivern2018-01-193-0/+37
| * Merge branch 'jej/lfs-rev-list-handles-non-utf-paths-41627' into 'master'Stan Hu2018-01-193-2/+16
| * Merge branch 'Ben305/gitlab-ce-36669-default-mr-title-with-external-issues' i...Grzegorz Bizon2018-01-193-8/+31