delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update VERSION to 10.0.2v10.0.2	Jarka Kadlecova	2017-09-27	1	-1/+1
\|
*	Update CHANGELOG.md for 10.0.2	Jarka Kadlecova	2017-09-27	5	-20/+7
\| \| \|	[ci skip]
*	Merge branch '10-0-stable-patch-2' into '10-0-stable'	Jarka Kadlecova	2017-09-26	28	-132/+256
\|\ \| \| \| \| \| \| \| \|	Prepare 10.0.2 release See merge request gitlab-org/gitlab-ce!14499
\| *	Merge branch 'winh-user-dropdown-nowrap' into 'master'10-0-stable-patch-2	Phil Hughes	2017-09-26	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid wrapping users in dropdown Closes #38077 See merge request gitlab-org/gitlab-ce!14410
\| *	Merge branch 'fix-locked-shared-runners-problem' into 'master'	Kamil Trzciński	2017-09-26	3	-52/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix locked shared runners problem Closes gitlab-runner#2782 See merge request gitlab-org/gitlab-ce!14483
\| *	Merge branch '37912-fix-dash-in-note-access-role' into 'master'	Rémy Coutable	2017-09-26	2	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a dash being rendered in the note's access role Closes #37912 See merge request gitlab-org/gitlab-ce!14450
\| *	Merge branch 'acet-switch-markdown-pane' into 'master'	Jacob Schatz	2017-09-26	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	IssueNotes: Switch back to Write pane when note cancel or submit. Closes #37907 See merge request gitlab-org/gitlab-ce!14402
\| *	Merge branch '38189-fix-user-avatar-url-cdn' into 'master'	Douwe Maan	2017-09-26	3	-50/+79
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent URL concatenation for avatars Closes #38189 See merge request gitlab-org/gitlab-ce!14437
\| *	Merge branch 'sh-fix-email-provider-take2' into 'master'	Yorick Peterse	2017-09-26	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix PG::UniqueViolation external_email migration Closes #38246 See merge request gitlab-org/gitlab-ce!14474
\| *	Merge branch '38280-undefined-run_command-when-running-rake-gitlab-check' ↵	Douwe Maan	2017-09-26	5	-2/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Undefined run_command when running rake gitlab:check" Closes #38280 See merge request gitlab-org/gitlab-ce!14469
\| *	Merge branch 'rs-allow-name-on-anchors' into 'master'	Douwe Maan	2017-09-26	3	-3/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Re-allow `name` attribute on user-provided anchor HTML Closes #38196 See merge request gitlab-org/gitlab-ce!14452
\| *	Merge branch '37287-remove-nav-gradient' into 'master'	Phil Hughes	2017-09-26	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove navbar gradient Closes #37287 See merge request gitlab-org/gitlab-ce!14457
\| *	Merge branch 'sh-blob-raw-check' into 'master'	Douwe Maan	2017-09-26	2	-0/+5
\| \| \| \| \| \| \| \| \| \|	Ensure that Blob.raw returns always returns a valid blob object See merge request gitlab-org/gitlab-ce!14412
\| *	Merge branch 'acet-fix-double-note-render' into 'master'	Jacob Schatz	2017-09-26	5	-19/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix rendering double note issue Closes #38139 See merge request gitlab-org/gitlab-ce!14429
\| *	Merge branch 'acet-fix-comment-form-resize' into 'master'	Jacob Schatz	2017-09-26	2	-0/+22
\|/ \| \| \| \| \| \|	IssueNotes: Resize comment form after note submit and discard. Closes #38115 See merge request gitlab-org/gitlab-ce!14401
*	Update VERSION to 10.0.1v10.0.1	Stan Hu	2017-09-23	1	-1/+1
\|
*	Update CHANGELOG.md for 10.0.1	Stan Hu	2017-09-23	2	-5/+4
\| \| \|	[ci skip]
*	Merge branch 'sh-fix-issue-38246' into 'master'	Yorick Peterse	2017-09-23	3	-2/+7
\| \| \| \| \| \| \|	Fix duplicate key errors in PostDeployMigrateUserExternalMailData migration Closes #38246 See merge request gitlab-org/gitlab-ce!14460
*	Update VERSION to 10.0.0v10.0.0	Jarka Kadlecova	2017-09-22	1	-1/+1
\|
*	Update CHANGELOG.md for 10.0.0	Jarka Kadlecova	2017-09-22	181	-892/+180
\| \| \|	[ci skip]
*	Update VERSION to 10.0.0-rc6v10.0.0-rc6	Robert Speicher	2017-09-21	1	-1/+1
\|
*	Merge branch '10-0-stable-prepare-rc6' into '10-0-stable'	Robert Speicher	2017-09-21	43	-431/+507
\|\ \| \| \| \| \| \| \| \|	Prepare 10.0 RC6 release See merge request gitlab-org/gitlab-ce!14424
\| *	Update nokogiri 1.8.0 -> 1.8.1 to resolve security advisory10-0-stable-prepare-rc6	Robert Speicher	2017-09-21	2	-5/+5
\| \| \| \| \| \| \| \|	See https://github.com/sparklemotion/nokogiri/issues/1673
\| *	Merge branch 'docs-updates-sharing-permissions-and-project-filter' into 'master'	Achilleas Pipinellis	2017-09-21	1	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \|	new sharing permissions screenshot See merge request gitlab-org/gitlab-ce!14408
\| *	Merge branch 'resolve-discussions-btn' into 'master'	Phil Hughes	2017-09-21	1	-14/+6
\| \| \| \| \| \| \| \| \| \|	Make resolve discussion icon gray See merge request gitlab-org/gitlab-ce!14398
\| *	Merge branch '32894-update-ux-icon-documentation' into 'master'	Marcia Ramos	2017-09-21	2	-12/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "[Meta] Create Uniquely 'GitLab' Icons" Closes #32894 See merge request gitlab-org/gitlab-ce!14396
\| *	Merge branch 'events-redundant-where' into 'master'	Rémy Coutable	2017-09-21	3	-7/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove redundant WHERE from event queries Closes #38129 See merge request gitlab-org/gitlab-ce!14389
\| *	Merge branch 'fix-autodevops-monitoring' into 'master'	Kamil Trzciński	2017-09-21	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support new auto-deploy helm chart Closes #38028 See merge request gitlab-org/gitlab-ce!14386
\| *	Merge branch '38088-remove-banner-to-customize-experience' into 'master'	Douwe Maan	2017-09-21	6	-157/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Remove banner to customize experience" Closes #38088 See merge request gitlab-org/gitlab-ce!14384
\| *	Merge branch 'fix-counts-caching' into 'master'	Douwe Maan	2017-09-21	12	-15/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix refreshing of issues/MR count caches Closes #38061 See merge request gitlab-org/gitlab-ce!14363
\| *	Merge branch '38049-fix-resolve-in-new-issue-btn' into 'master'	Annabel Dunstone Gray	2017-09-21	3	-8/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the "resolve discussion in a new issue" button Closes #38049 See merge request gitlab-org/gitlab-ce!14357
\| *	Merge branch 'sh-project-feature-eager-load' into 'master'	Yorick Peterse	2017-09-21	2	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Eliminate N+1 queries referencing issues Closes #38033 See merge request gitlab-org/gitlab-ce!14349
\| *	Merge branch 'sh-optimize-discussion-json' into 'master'	Yorick Peterse	2017-09-21	4	-3/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Eliminate N+1 queries in loading discussions.json endpoint Closes #37955 See merge request gitlab-org/gitlab-ce!14327
\| *	Merge branch 'docs/autodevops-cleanup' into 'master'	Achilleas Pipinellis	2017-09-21	4	-200/+370
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Auto DevOps docs cleanup Closes #37666, #37592, #37468, and #31641 See merge request gitlab-org/gitlab-ce!14293
\| *	Merge branch '37862-breadcrumbs-mobile' into 'master'	Tim Zallmann	2017-09-21	2	-5/+12
\|/ \| \| \| \| \| \|	Fix mobile sidebar button to match height of desktop breadcrumbs Closes #37862 See merge request gitlab-org/gitlab-ce!14282
*	Update VERSION to 10.0.0-rc5v10.0.0-rc5	Jarka Kadlecova	2017-09-21	1	-1/+1
\|
*	Merge branch '10-0-stable-prepare-rc5' into '10-0-stable'	Robert Speicher	2017-09-20	94	-928/+658
\|\ \| \| \| \| \| \| \| \|	Prepare 10.0 RC5 release See merge request gitlab-org/gitlab-ce!14352
\| *	Merge branch 'ce-backport-new-sidebar-boards' into 'master'10-0-stable-prepare-rc5	Filipa Lacerda	2017-09-20	3	-7/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE backport of new-sidebar-boards See merge request !14246 # Conflicts: # app/views/layouts/nav/sidebar/_project.html.haml
\| *	Merge branch 'revert-feature-highlight' into 'master'	Jacob Schatz	2017-09-20	13	-736/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert feature highlight Closes #38087 See merge request gitlab-org/gitlab-ce!14373 # Conflicts: # app/views/layouts/nav/sidebar/_project.html.haml
\| *	Merge branch '37894-handle-if-auto-devops-domain-is-not-set' into 'master'	Stan Hu	2017-09-20	7	-12/+118
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Handle if Auto DevOps domain is not set" Closes #37894 See merge request gitlab-org/gitlab-ce!14319
\| *	Merge branch 'fix/gitaly-commit-diff-rpc-encoding-error' into 'master'	Robert Speicher	2017-09-20	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Encode paths properly for Gitaly Commit{Diff,Delta} Closes gitaly#589 See merge request gitlab-org/gitlab-ce!14361
\| *	Merge branch 'fix/gb/fix-moving-issue-with-ambiguous-references' into 'master'	Rémy Coutable	2017-09-20	7	-24/+77
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix rewriting issue references with group milestones Closes #37746 See merge request gitlab-org/gitlab-ce!14294
\| *	Merge branch 'do-not-perform-disk-check' into 'master'	Stan Hu	2017-09-19	4	-3/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not perform hard check (presence of file on storage) Closes #37945 See merge request gitlab-org/gitlab-ce!14369
\| *	Merge branch '38060-fix-groups-api-owned-groups' into 'master'	Douwe Maan	2017-09-19	2	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the groups API endpoint to handle ?owned=true correctly Closes #38060 See merge request gitlab-org/gitlab-ce!14362
\| *	Merge branch 'backstage/gb/qa/fix-admin-area-selector' into 'master'	Rémy Coutable	2017-09-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix admin area selector in GitLab QA Closes gitlab-qa#66 See merge request gitlab-org/gitlab-ce!14356
\| *	Merge branch 'sh-stop-loading-issue-discussions' into 'master'	Douwe Maan	2017-09-19	2	-3/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unnecessary loading of discussions in `IssuesController#show` Closes #38034 See merge request gitlab-org/gitlab-ce!14351
\| *	Merge branch 'reoganize-deployment-indexes' into 'master'	Stan Hu	2017-09-19	5	-5/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reorganize indexes for the "deployments" table Closes #36877 See merge request gitlab-org/gitlab-ce!14348
\| *	Merge branch 'fix-rails-migrations-for-partial-indexes' into 'master'	Yorick Peterse	2017-09-19	2	-2/+2
\| \| \| \| \| \| \| \| \| \|	Fix regular expression used for opclasses to not be confused by partial index clause See merge request gitlab-org/gitlab-ce!14343
\| *	Merge branch ↵	Stan Hu	2017-09-19	2	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'37890-auto-devops-banner-is-not-shown-when-the-repository-is-empty-new-project' into 'master' Resolve "Auto DevOps banner is not shown when the repository is empty (new project)" Closes #37890 See merge request gitlab-org/gitlab-ce!14321
\| *	Merge branch 'zj-update-project-settings' into 'master'	Grzegorz Bizon	2017-09-19	3	-3/+46
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow updating of project auto devops settings Closes #37893 See merge request gitlab-org/gitlab-ce!14291