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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\| *	Merge branch 'issue_37640_9_5_stable' into '9-5-stable'	Grzegorz Bizon	2017-09-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix project feature being deleted when updating project with invalid visibility level See merge request gitlab-org/gitlab-ce!14235 # Conflicts: # db/schema.rb # spec/services/projects/update_service_spec.rb
\| *	Merge branch ↵	Grzegorz Bizon	2017-09-19	3	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'36907-new-issue-from-failed-build-no-longer-links-to-failed-build' into 'master' Resolve "New issue from failed build no longer links to failed build" Closes #36907 See merge request !13790
\| *	Merge branch 'role-badge-fix' into 'master'	Douwe Maan	2017-09-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	IssueNotes: Fix role badge styling. See merge request gitlab-org/gitlab-ce!14279
\| *	Merge branch '37590-pipelines-mr' into 'master'	Annabel Dunstone Gray	2017-09-19	2	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix mini graph pipeline breaking in merge request view Closes #37590 See merge request gitlab-org/gitlab-ce!14306
\| *	Merge branch '37465-fix-line-resolve-all-green-checkmark-icon' into 'master'	Annabel Dunstone Gray	2017-09-19	3	-2/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update "x/x discussions resolved" checkmark icon to be green when all discussions resolved Closes #37465 See merge request gitlab-org/gitlab-ce!14255
\| *	Merge branch '33287-fix-mr-widget-errors-with-external-services' into 'master'	Fatih Acet	2017-09-19	10	-25/+157
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix MR widget with external CI services/integrations Closes #33287 See merge request gitlab-org/gitlab-ce!13977
\| *	Merge branch '37259-some-mr-ready-mobile-fixes' into 'master'	Fatih Acet	2017-09-19	4	-3/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix MR widget with ready to merge buttons/controls at mobile breakpoint Closes #37259 See merge request gitlab-org/gitlab-ce!14242
\| *	Merge branch '37957-fix-groups-members-flyout-link' into 'master'	Phil Hughes	2017-09-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use correct group members path for members flyout link Closes #37957 See merge request gitlab-org/gitlab-ce!14329
\| *	Merge branch 'issue_37640' into 'master'	Grzegorz Bizon	2017-09-19	6	-6/+67
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix project feature being deleted when updating project with invalid visibility level Closes #37640 See merge request gitlab-org/gitlab-ce!14234
\| *	Merge branch 'docs-replace-pipelines-cicd' into 'master'	Achilleas Pipinellis	2017-09-19	6	-17/+17
\| \| \| \| \| \| \| \| \| \|	Change Pipelines to CI/CD for Settings page See merge request gitlab-org/gitlab-ce!14168
\| *	Merge branch '37857-build-header-gap' into 'master'	Phil Hughes	2017-09-19	2	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove gaps under nav on build page Closes #37857 See merge request gitlab-org/gitlab-ce!14283
\| *	Merge branch 'fix_wiki_md' into 'master'	Achilleas Pipinellis	2017-09-19	1	-0/+2
\| \| \| \| \| \| \| \| \| \|	Fix broken link in docs/api/wiki.md See merge request gitlab-org/gitlab-ce!14296
\| *	Merge branch '37454-remove-confidential-cb-edit-issue' into 'master'	Phil Hughes	2017-09-19	7	-62/+0
\|/ \| \| \| \| \| \|	Remove confidential toggle checkbox while editing issue inline Closes #37454 See merge request !14142
*	Update VERSION to 10.0.0-rc4v10.0.0-rc4	Jarka Kadlecova	2017-09-18	1	-1/+1
\|
*	Merge branch '10-0-stable-prepare-rc4' into '10-0-stable'	Jarka Kadlecova	2017-09-18	22	-31/+279
\|\ \| \| \| \| \| \| \| \|	Prepare 10.0 RC4 release See merge request gitlab-org/gitlab-ce!14310
\| *	Merge branch 'rs-default-user-entity' into 'master'10-0-stable-prepare-rc4	Stan Hu	2017-09-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	Ensure we use `Entities::User` for non-admin `users/:id` API requests See merge request gitlab-org/gitlab-ce!14314
\| *	Merge branch 'rs-incoming-email-domain-docs' into 'security-10-0'	Robert Speicher	2017-09-17	1	-2/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Security Concerns section to reply by email documentation [ci skip] See merge request gitlab/gitlabhq!2191
\| *	Merge branch 'fix-share-with-group-lock-update' into 'master'	Robert Speicher	2017-09-15	4	-4/+51
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix setting share_with_group_lock Closes #37916 See merge request gitlab-org/gitlab-ce!14300
\| *	Merge branch '37886-typo-in-protected-runners-setting-checkbox' into 'master'	Grzegorz Bizon	2017-09-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Typo in Protected Runners setting checkbox" Closes #37886 See merge request gitlab-org/gitlab-ce!14284
\| *	Merge branch '37844-layout-nav-space' into 'master'	Phil Hughes	2017-09-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove extra space between profile header and navbar Closes #37844 See merge request gitlab-org/gitlab-ce!14275