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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove dead `Gitlab::Markdown::Pipeline` classrs-remove-dead-markdown-pipeline	Robert Speicher	2017-09-25	1	-32/+0
\|
*	Merge branch 'sh-fix-email-provider-take2' into 'master'	Yorick Peterse	2017-09-25	2	-2/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix PG::UniqueViolation external_email migration Closes #38246 See merge request gitlab-org/gitlab-ce!14474
\| *	Fix PG::UniqueViolation external_email migrationsh-fix-email-provider-take2	Stan Hu	2017-09-25	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Missing parens prevented this migration from working in some cases. Closes #38246
* \|	Merge branch '34371-cycle-analitcs-global' into 'master'	Phil Hughes	2017-09-25	4	-59/+54
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Removes cycle analytics service and store from global namespace See merge request gitlab-org/gitlab-ce!14463
\| * \|	Removes cycle analytics service and store from global namespace	Filipa Lacerda	2017-09-25	4	-59/+54
\|/ /
* \|	Merge branch 'gitaly-508-find-commits' into 'master'38204-comment-form-doesn-t-switch-back-to-write-tab-after-submitting	Douwe Maan	2017-09-25	4	-2/+44
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate Gitlab::Git::Repository#log to Gitaly Closes gitaly#508 See merge request gitlab-org/gitlab-ce!14179
\| * \|	Migrate Gitlab::Git::Repository#log to Gitaly	Kim "BKC" Carlbäcker	2017-09-25	4	-2/+44
\| \| \|
* \| \|	Merge branch '38189-fix-user-avatar-url-cdn' into 'master'	Douwe Maan	2017-09-25	3	-50/+79
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent URL concatenation for avatars Closes #38189 See merge request gitlab-org/gitlab-ce!14437
\| * \| \|	Update tests to reflect `user_avatar_without_link` helper changes38189-fix-user-avatar-url-cdn	kushalpandya	2017-09-25	1	-40/+62
\| \| \| \|
\| * \| \|	Add `data-src` when image is to be lazy loaded, use `tag` helper instead of ↵	kushalpandya	2017-09-25	1	-9/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`image_tag` helper
\| * \| \|	Remove unnecessary use of `gsub`	kushalpandya	2017-09-25	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'improve_sorting_list' into 'master'	Douwe Maan	2017-09-25	19	-332/+304
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve list of sorting options Closes #36929 See merge request gitlab-org/gitlab-ce!14320
\| * \| \| \|	Improve list of sorting options	Vitaliy @blackst0ne Klachkov	2017-09-23	19	-332/+304
\| \| \| \| \|
* \| \| \| \|	Merge branch 'project-page-clearer' into 'master'	Filipa Lacerda	2017-09-25	7	-7/+59
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add context tabs to dashboard/projects Closes #29045 See merge request gitlab-org/gitlab-ce!14364
\| * \| \| \|	simplify link_to callproject-page-clearer	Phil Hughes	2017-09-22	1	-4/+2
\| \| \| \| \|
\| * \| \| \|	Fixes dashboard/projects empty state showing when viewing personal projects	Phil Hughes	2017-09-22	3	-7/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was caused by the `@projects` value being empty when the current user does not have any personal projects.
\| * \| \| \|	Add context tabs to dashboard/projects	Phil Hughes	2017-09-22	5	-0/+50
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows users to quickly switch between all projects they have access to & there own namespace projects. These tabs also keep the same filtering/search options selected so the user can quickly switch between the two different contexts. Closes #29045
* \| \| \| \|	Merge branch 'fly-out-nav-mousepos-error' into 'master'	Filipa Lacerda	2017-09-25	2	-1/+7
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed fly-out error if mousePos array is empty See merge request gitlab-org/gitlab-ce!14338
\| * \| \| \|	spec fixesfly-out-nav-mousepos-error	Phil Hughes	2017-09-22	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Fixed fly-out error if mousePos array is empty	Phil Hughes	2017-09-22	2	-1/+7
\| \| \| \| \|
* \| \| \| \|	Merge branch '38280-undefined-run_command-when-running-rake-gitlab-check' ↵	Douwe Maan	2017-09-25	5	-2/+44
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Undefined run_command when running rake gitlab:check" Closes #38280 See merge request gitlab-org/gitlab-ce!14469
\| * \| \| \| \|	Fixed few gitlab:check tasks that were failing with exception38280-undefined-run_command-when-running-rake-gitlab-check	Gabriel Mazetto	2017-09-25	5	-2/+44
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge branch ↵	Achilleas Pipinellis	2017-09-25	1	-0/+16
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'38021-add-instructions-for-upgrading-from-ce-to-ee-using-gitlab-omnibus-chart-docs' into 'master' Add instructions for upgrading from CE to EE using GitLab Omnibus chart - docs Closes #38021 See merge request gitlab-org/gitlab-ce!14347
\| * \| \| \| \|	Add instructions for upgrading from CE to EE using GitLab Omnibus chart - docs	Joshua Lambert	2017-09-25	1	-0/+16
\|/ / / / /
* \| \| \| \|	Merge branch 'rs-allow-name-on-anchors' into 'master'	Douwe Maan	2017-09-25	3	-3/+13
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Re-allow `name` attribute on user-provided anchor HTML Closes #38196 See merge request gitlab-org/gitlab-ce!14452
\| * \| \| \| \|	Make the "customizes the whitelist only once" spec less brittlers-allow-name-on-anchors	Robert Speicher	2017-09-22	1	-1/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Re-allow `name` attribute on user-provided anchor HTML	Robert Speicher	2017-09-22	3	-2/+10
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'rc/refactor-project_policy_spec-ce' into 'master'	Douwe Maan	2017-09-25	1	-47/+86
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor spec/policies/project_policy_spec.rb to minimize the diff with EE See merge request gitlab-org/gitlab-ce!14434
\| * \| \| \| \| \|	Refactor spec/policies/project_policy_spec.rb to minimize the diff with EErc/refactor-project_policy_spec-ce	Rémy Coutable	2017-09-22	1	-47/+86
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch '37287-remove-nav-gradient' into 'master'	Phil Hughes	2017-09-25	1	-2/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove navbar gradient Closes #37287 See merge request gitlab-org/gitlab-ce!14457
\| * \| \| \| \| \| \|	Remove navbar gradient37287-remove-nav-gradient	Annabel Dunstone Gray	2017-09-22	1	-2/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'sh-remove-additional-grit-settings' into 'master'	Rémy Coutable	2017-09-25	1	-3/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove Grit settings from default settings See merge request gitlab-org/gitlab-ce!14465
\| * \| \| \| \| \| \| \|	Remove Grit settings from default settingssh-remove-additional-grit-settings	Stan Hu	2017-09-23	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a follow-up to https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/1956 and https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7308.
* \| \| \| \| \| \| \| \|	Merge branch 'master' into 'master'	Rémy Coutable	2017-09-25	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix minor spelling mistakes See merge request gitlab-org/gitlab-ce!14467
\| * \| \| \| \| \| \| \|	fix minor spelling mistakes	René Genz	2017-09-20	1	-2/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \|	Fix duplicate key errors in PostDeployMigrateUserExternalMailData migrationsh-fix-issue-38246	Stan Hu	2017-09-22	3	-2/+7
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`email_provider` by default is NULL, and if a user had not logged the value would remain NULL. Upgrading to GitLab 10.0 would lead to a PG::UniqueViolation because the post-deploy migration would attempt to reinsert the entry because the NULL comparison between `users.email_provider` and `user_synced_attributes_metadata.email_provider` would never match. Closes #38246
* \| \| \| \| \| \|	Merge branch '38171-workaround' into 'master'	Robert Speicher	2017-09-22	1	-1/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Workaround for n+1 in Projects::TreeController#show Closes #38171 See merge request gitlab-org/gitlab-ce!14455
\| * \| \| \| \| \| \|	Workaround for n+1 in Projects::TreeController#show38171-workaround	Andrew Newdigate	2017-09-22	1	-1/+4
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ce/issues/38261
* \| \| \| \| \| \|	Merge branch '36549-circuit-breaker-handles-missing-storages' into 'master'	Douwe Maan	2017-09-22	10	-22/+175
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow the git circuit breaker to correctly handle missing repository storages Closes #36549 See merge request gitlab-org/gitlab-ce!14417
\| * \| \| \| \| \| \|	Allow the git circuit breaker to correctly handle missing repository storages	Nick Thomas	2017-09-22	10	-22/+175
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'docs-update-ux-guide' into 'master'	Marcia Ramos	2017-09-22	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix typo in icons section See merge request gitlab-org/gitlab-ce!14444
\| * \| \| \| \| \| \|	fix typo in icons sectiondocs-update-ux-guide	Sarrah Vesselov	2017-09-22	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'post_receive_n_plus_1_workaround' into 'master'	Robert Speicher	2017-09-22	1	-2/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Workaround for #38259 See merge request gitlab-org/gitlab-ce!14453
\| * \| \| \| \| \| \| \|	Workaround for #38259	Andrew Newdigate	2017-09-22	1	-2/+5
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'dm-group-share-lock-default-help' into 'master'	Rémy Coutable	2017-09-22	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Inform user that current shared projects will remain shared Closes #38220 See merge request gitlab-org/gitlab-ce!14441
\| * \| \| \| \| \| \| \|	Inform user that current shared projects will remain shareddm-group-share-lock-default-help	Douwe Maan	2017-09-22	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'remove-redundant-icons' into 'master'	Annabel Dunstone Gray	2017-09-22	6	-29/+3
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed old icons from project page Closes #36567 See merge request gitlab-org/gitlab-ce!14185
\| * \| \| \| \| \| \| \|	Removed old icons from project page	Phil Hughes	2017-09-22	6	-29/+3
\|/ / / / / / / /