summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update VERSION to 11.0.2v11.0.2GitLab Release Tools Bot2018-06-261-1/+1
* Update CHANGELOG.md for 11.0.2GitLab Release Tools Bot2018-06-2611-50/+22
* Merge branch '11-0-stable-patch-2' into '11-0-stable'Mayra Cabrera2018-06-26130-497/+1644
|\
| * Merge branch '48269-wiki-page-returns-error-code-502' into 'master'Douwe Maan2018-06-262-2/+9
| * Merge branch '48339-sorting-by-name-on-explore-projects-page-renders-a-500-er...Robert Speicher2018-06-263-6/+21
| * Merge branch 'fix-webpack-node-env' into 'master'Clement Ho2018-06-262-1/+1
| * Merge branch 'fix-alert-btn' into 'master'Mike Greiling2018-06-262-1/+6
| * Merge branch 'go-1.10-source-installs' into 'master'Nick Thomas2018-06-262-11/+11
| * Merge branch 'mk/fix-n-plus-1-queries-in-uploads-check-rake-task' into 'master'11-0-stable-patch-2Stan Hu2018-06-253-9/+39
| * Merge branch 'mk/rake-task-verify-remote-files' into 'master'Stan Hu2018-06-2510-41/+147
| * Merge branch '11-0-stable' into 11-0-stable-patch-2Mayra Cabrera2018-06-2514-27/+107
| |\ | |/ |/|
* | Update VERSION to 11.0.1v11.0.1Alessio Caiazza2018-06-211-1/+1
* | Update CHANGELOG.md for 11.0.1Alessio Caiazza2018-06-216-25/+11
* | Merge branch 'security-html_escape_branch_name-11-0' into 'security-11-0'Filipa Lacerda2018-06-213-2/+25
* | Merge branch 'security-security-rd-do-not-show-internal-info-in-public-feed-1...Mayra Cabrera2018-06-213-14/+38
* | Merge branch 'security-html_escape_usernames-11-0' into 'security-11-0'Mayra Cabrera2018-06-213-2/+15
* | Merge branch 'security-fj-bumping-sanitize-gem-11-0' into 'security-11-0'Mayra Cabrera2018-06-215-7/+27
* | Merge branch 'security-2682-fix-xss-for-markdown-toc-11-0' into 'security-11-0'Mayra Cabrera2018-06-213-1/+15
| * Merge branch '6591-dont-load-omniauth-if-not-enabled' into 'master'Stan Hu2018-06-252-1/+8
| * Merge branch '6598-notify-only-open-unmergeable-mr' into 'master'Sean McGivern2018-06-255-27/+52
| * Merge branch 'mk/log-invalid-byte-sequence-in-us-ascii-qa' into 'master'Stan Hu2018-06-251-6/+18
| * Merge branch 'sh-add-recaptcha-all-logins' into 'master'Robert Speicher2018-06-255-6/+88
| * Merge branch 'enforce-variable-value-to-be-a-string' into 'master'Grzegorz Bizon2018-06-257-19/+81
| * Merge branch '47488-remove-unmergeable-notification-for-no-commits-11-0-port'...Mayra Cabrera2018-06-259-69/+33
| |\
| | * [11.0] Notify only merge request unmergeable due to conflictMark Chao2018-06-259-69/+33
| |/
| * Merge branch '48296-remove-top-padding-on-gpg-popovers' into 'master'Mike Greiling2018-06-251-0/+6
| * Merge branch 'rs-update-sprockets' into 'master'Stan Hu2018-06-251-1/+1
| * Merge branch 'docs/api-runners-ip' into 'master'Marcia Ramos2018-06-251-0/+12
| * Merge branch 'jl-helm-polish-docs' into 'master'Mike Lewis2018-06-252-9/+10
| * Merge branch 'restore-custom-hooks-wiki' into 'master'Douwe Maan2018-06-251-0/+2
| * Merge branch 'jl-helm-docs' into 'master'Marcia Ramos2018-06-258-32/+395
| * Merge branch 'fix-raspi-issues' into 'master'Clement Ho2018-06-251-1/+4
| * Merge branch 'sh-fix-login-active-tabs' into 'master'Clement Ho2018-06-251-2/+2
| * Merge branch 'bvl-dont-generate-mo' into 'master'Rubén Dávila2018-06-252-1/+5
| * Merge branch '47964-custom-logo-rendering-improperly-on-sign-in-page-2' into ...Mike Greiling2018-06-251-1/+1
| * Merge branch 'revert-80044bda' into 'master'Clement Ho2018-06-252-6/+0
| * Merge branch '48126-fix-prometheus-installation' into 'master'Kamil Trzciński (Conference till 20th)2018-06-259-34/+59
| * Merge branch 'fix-diff-comment-alignment' into 'master'Mike Greiling2018-06-252-5/+4
| * Merge branch 'fix/favicon-cross-origin' into 'master'Douwe Maan2018-06-253-5/+35
| * Merge branch 'docs/autodevops-k8s' into 'master'Marcia Ramos2018-06-2530-160/+309
| * Merge branch 'project_wiki_scenario_automation' into 'master'Rémy Coutable2018-06-2522-70/+314
|/
* Update VERSION to 11.0.0v11.0.0Filipa Lacerda2018-06-211-1/+1
* Update CHANGELOG.md for 11.0.0Filipa Lacerda2018-06-21214-1074/+240
* Update VERSION to 11.0.0-rc14v11.0.0-rc14GitLab Release Tools Bot2018-06-201-1/+1
* Merge branch '11-0-stable-prepare-rc14' into '11-0-stable'Filipa Lacerda2018-06-2017-18/+44
|\
| * Merge branch '48025-branch-name-status-color-is-not-correct-anymore' into 'ma...11-0-stable-prepare-rc14Tim Zallmann2018-06-193-5/+9
| * Merge branch 'jl-update-jupyterhub-docs' into 'master'Marcia Ramos2018-06-191-1/+1
| * Merge branch 'jivl-fix-focused-links-missing-underline' into 'master'Tim Zallmann2018-06-192-0/+6
| * Merge branch 'jivl-fix-cancel-auto-merge-button-height' into 'master'Clement Ho2018-06-191-0/+1
| * Merge branch '48047-project-integrations' into 'master'Clement Ho2018-06-191-1/+1