summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add changelog entries for 10.0.7winh-10-0-changelog-entries-docsWinnie Hellmann2017-12-131-0/+11
* Merge branch 'mk-add-security-fixes-to-changelog-10-0-stable' into '10-0-stable'Stan Hu2017-11-091-1/+2
|\
| * Add 10.0.6 security fixes to CHANGELOG.mdmk-add-security-fixes-to-changelog-10-0-stableMichael Kozono2017-11-091-1/+2
|/
* Update VERSION to 10.0.6v10.0.6Lin Jen-Shin2017-11-081-1/+1
* Update CHANGELOG.md for 10.0.6Lin Jen-Shin2017-11-081-0/+4
* Merge branch 'security-10-0-36099-api-responses-missing-x-content' into 'secu...Douwe Maan2017-11-073-1/+15
* Merge branch 'ssrf-protections-round-2-10-0' into 'security-10-0'Douwe Maan2017-11-072-1/+19
* Update VERSION to 10.0.5v10.0.5Jarka Kadlecova2017-11-031-1/+1
* Update CHANGELOG.md for 10.0.5Jarka Kadlecova2017-11-0316-76/+18
* Merge branch '10-0-stable-patch-5' into '10-0-stable'Jarka Kadlecova2017-11-0371-274/+894
|\
| * Fix spec for Projects::UpdateService10-0-stable-patch-5Douglas Barbosa Alexandre2017-11-011-1/+1
| * Fix spec for Projects::CreateServiceDouglas Barbosa Alexandre2017-11-011-2/+2
| * Try to fix conflict resolutionJarka Kadlecova2017-11-012-14/+2
| * fix wrongly resolved conflictJarka Kadlecova2017-11-011-1/+0
| * Merge branch '38202-cannot-rename-a-hashed-project' into 'master'Nick Thomas2017-11-014-31/+103
| * Merge branch 'pawel/bump_prometheus_gem_to_fix_read_all_values_returning_bad_...Stan Hu2017-11-012-3/+3
| * Merge branch 'fix_global_board_routes_39073' into 'master'Douwe Maan2017-11-014-3/+21
| * Merge branch 'backport-ee-2869' into 'master'Sean McGivern2017-11-013-17/+35
| * Merge branch 'pawel/upgrade_prometheus_gem_to_fix_problem_with_file_locking' ...Stan Hu2017-11-012-3/+3
| * Merge branch 'capture-rev-list-errors' into 'master'Sean McGivern2017-11-011-1/+1
| * Merge branch '37229-mr-widget-status-icon' into 'master'Jacob Schatz2017-11-013-19/+89
| * Merge branch '38641-repo-editor-callout' into 'master'Jacob Schatz2017-11-011-1/+1
| * Merge branch 'acet-disabled-comment-textarea-while-requesting' into 'master'Filipa Lacerda2017-11-012-0/+41
| * Merge branch '38187-38315-fix-dropdown-open-top-bottom-spacing' into 'master'Annabel Dunstone Gray2017-11-017-3/+14
| * Merge branch 'mr-widget-merged-date-tooltip' into 'master'Filipa Lacerda2017-11-016-22/+70
| * Merge branch 'bvl-dont-rename-free-names' into 'master'Douwe Maan2017-11-012-11/+5
| * Merge branch 'fix-application-setting-nil-cache' into 'master'Winnie Hellmann2017-11-014-2/+25
| * Merge branch 'sh-api-json-logs' into 'master'Achilleas Pipinellis2017-11-011-2/+22
| * Merge branch '37691-subscription-fires-multiple-notifications' into 'master'Sean McGivern2017-11-014-8/+25
| * Merge branch 'acet-fix-paste-on-comment-form' into 'master'Filipa Lacerda2017-11-011-1/+4
| * Merge branch 'fix/import-issue-assignees' into 'master'Sean McGivern2017-11-017-1/+27
| * Merge branch '35580-cannot-import-project-with-milestones' into 'master'Sean McGivern2017-11-016-98/+333
| * Merge branch '38197-fix-ImapAuthenticationCheck' into 'master'Douwe Maan2017-11-012-17/+33
| * Merge branch 'sh-fix-gitlab-qa-ee-license-add' into 'master'Grzegorz Bizon2017-11-012-4/+1
| * Merge branch 'group-milestones-breadcrumb' into 'master'Tim Zallmann2017-11-012-1/+7
| * Merge branch '38789-prometheus-graphs-occasionally-have-incorrect-y-scale' in...Tim Zallmann2017-11-012-1/+6
| * Merge branch '37105-monitoring-graph-axes-labels-are-inaccurate-and-inconsist...Tim Zallmann2017-11-016-14/+27
* | Merge branch '10-0-breadcrumb-item-links' into '10-0-stable'Jarka Kadlecova2017-11-015-8/+17
|\ \ | |/ |/|
| * spec fixes10-0-breadcrumb-item-linksPhil Hughes2017-11-011-2/+2
| * Stable port of breadcrumb-item-linksTim Zallmann2017-11-014-6/+15
|/
* Update VERSION to 10.0.4v10.0.4Jarka Kadlecova2017-10-161-1/+1
* Update CHANGELOG.md for 10.0.4Jarka Kadlecova2017-10-164-15/+6
* Remove redundant specRobert Speicher2017-10-111-6/+0
* Merge branch 'port-ee-3435' into 'security-10-0'Robert Speicher2017-10-114-31/+11
* Merge branch '38126-security-username-change' into 'security-10-0'Douwe Maan2017-10-114-13/+50
* Merge branch 'winh-search-bar-xss' into 'security-10-0'Phil Hughes2017-10-112-2/+25
* Merge branch 'rs-sanitize-unicode-in-protocol' into 'security-10-0'Douwe Maan2017-10-113-2/+22
* Merge branch 'fix-arbitrary-redirect-vulnerability' into 'security-10-0'Robert Speicher2017-10-113-10/+15
* Merge branch 'rs-qa-default-password' into 'master'Grzegorz Bizon2017-10-102-4/+39
* Update VERSION to 10.0.3v10.0.3Jarka Kadlecova2017-10-051-1/+1