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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Sort by id, not created_atjobs-sort-by-id	Kamil Trzcinski	2017-09-26	2	-1/+6
\|
*	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
\| *	Deleted another Fixture due to User Callout38088-remove-banner-to-customize-experience	Tim Zallmann	2017-09-20	1	-30/+0
\| \|
\| *	Fixture Creation removed	Tim Zallmann	2017-09-20	1	-5/+0
\| \|
\| *	Deleted Karma Specs for userCallout	Tim Zallmann	2017-09-20	1	-49/+0
\| \|
\| *	Removed User Callout for Customer Experience	Tim Zallmann	2017-09-20	4	-73/+0
\| \|
* \|	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
\| * \|	Remove redundant WHERE from event queriesevents-redundant-where	Yorick Peterse	2017-09-20	3	-7/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The default scope in Event would add a "WHERE author_id IS NOT NULL" clause to every query. Now that "events.author_id" has a NOT NULL clause set this filter is redundant and we can safely remove it. In this commit we also add a validation on events.author_id (previously only defined in PushEvent) just in case something tries to create data without an author ID. This way we can present a nicer error message compared to PostgreSQL's foreign key error messages. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/38129
* \| \|	Merge branch 'remove-use-key-worker' into 'master'	Rémy Coutable	2017-09-21	8	-65/+116
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stop using Sidekiq for updating Key#last_used_at Closes #36663 See merge request gitlab-org/gitlab-ce!14391
\| * \| \|	Stop using Sidekiq for updating Key#last_used_atremove-use-key-worker	Yorick Peterse	2017-09-20	8	-65/+116
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes things simpler as no scheduling is involved. Further we remove the need for running a SELECT + UPDATE just to get the key and update it, whereas we only need an UPDATE when setting last_used_at directly in a request. The added service class takes care of updating Key#last_used_at without using Sidekiq. Further it makes sure we only try to obtain a Redis lease if we're confident that we actually need to do so, instead of always obtaining it. We also make sure to _only_ update last_used_at instead of also updating updated_at. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36663
* \| \|	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
\| * \| \|	Make resolve discussion icon grayresolve-discussions-btn	Annabel Dunstone Gray	2017-09-20	1	-14/+6
\| \| \| \|
* \| \| \|	Merge branch '10-0-sync-master' into 'master'	Simon Knox	2017-09-21	16	-79/+19
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sync dev to gitlab.com See merge request gitlab-org/gitlab-ce!14406
\| * \ \ \	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	Jarka Kadlecova	2017-09-21	16	-79/+19
\| \|\ \ \ \ \|/ / / / /
\| * \| \| \|	Update CHANGELOG.md for 9.5.5	Simon Knox	2017-09-18	16	-79/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \|	Merge branch 'fix-image-diff-swipe-handle' into 'master'	Annabel Dunstone Gray	2017-09-20	2	-1/+7
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix image diff swipe handle offset to correctly align with the frame Closes #37928 See merge request gitlab-org/gitlab-ce!14392
\| * \| \| \|	Fix image diff swipe handle offset to correctly align with the framefix-image-diff-swipe-handle	Clement Ho	2017-09-20	2	-1/+7
\| \| \| \| \|
* \| \| \| \|	Merge branch '38049-fix-resolve-in-new-issue-btn' into 'master'	Annabel Dunstone Gray	2017-09-20	3	-8/+17
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the "resolve discussion in a new issue" button Closes #38049 See merge request gitlab-org/gitlab-ce!14357
\| * \| \| \|	Fix the "resolve discussion in a new issue" button	Nick Thomas	2017-09-20	3	-8/+17
\| \| \| \| \|
* \| \| \| \|	Merge branch '37862-breadcrumbs-mobile' into 'master'	Tim Zallmann	2017-09-20	2	-5/+12
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix mobile sidebar button to match height of desktop breadcrumbs Closes #37862 See merge request gitlab-org/gitlab-ce!14282
\| * \| \| \| \|	Vertically center hamburger button37862-breadcrumbs-mobile	Annabel Dunstone Gray	2017-09-18	2	-7/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Increase tap target on hamburger menu	Annabel Dunstone Gray	2017-09-15	2	-3/+8
\| \| \| \| \| \|
\| * \| \| \| \|	Fix mobile sidebar button to match height of desktop breadcrumbs	Annabel Dunstone Gray	2017-09-14	1	-0/+6
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'gitlab-git-popen' into 'master'	Douwe Maan	2017-09-20	7	-13/+19
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use Gitlab::Git's Popen on that module's code Closes gitaly#597 See merge request gitlab-org/gitlab-ce!14237
\| * \| \| \| \| \|	Use Gitlab::Git's Popen on that module's codegitlab-git-popen	Alejandro Rodríguez	2017-09-20	7	-13/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows the current Gitaly migration to depend on less code outside of the Gitlab::Git module
* \| \| \| \| \| \|	Merge branch '32796-tighten-up-remove-old-while-backing-up-gitlab' into 'master'	Rémy Coutable	2017-09-20	2	-10/+38
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tighten up remove_old regex from gitlab backup manager. Closes #32796 See merge request gitlab-org/gitlab-ce!14333
\| * \| \| \| \| \| \|	Tighten up remove_old regex from gitlab backup manager.32796-tighten-up-remove-old-while-backing-up-gitlab	Tiago Botelho	2017-09-20	2	-10/+38
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'workhorse-3.1.0' into 'master'	Rémy Coutable	2017-09-20	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use gitlab-workhorse 3.1.0 See merge request gitlab-org/gitlab-ce!14390
\| * \| \| \| \| \| \| \|	Use gitlab-workhorse 3.1.0	Jacob Vosmaer	2017-09-20	1	-1/+1
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fix-counts-caching' into 'master'	Douwe Maan	2017-09-20	12	-15/+28
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix refreshing of issues/MR count caches Closes #38061 See merge request gitlab-org/gitlab-ce!14363
\| * \| \| \| \| \| \| \|	Fix refreshing of issues/MR count cachesfix-counts-caching	Yorick Peterse	2017-09-19	12	-15/+28
\| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This ensures the open issues/MR count caches are refreshed properly when creating new issues or MRs. This MR also includes a change to the cache keys to ensure all caches are rebuilt on the fly. This particular problem was not caught in the test suite due to a null cache being used, resulting in all calls that would use a cache using the underlying data directly. In production the code would fail because a newly saved record returns an empty hash in #changes meaning checks such as `state_changed? \|\| confidential_changed?` would return false for new rows, thus never updating the counters. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/38061
* \| \| \| \| \| \| \|	Merge branch 'fix-autodevops-monitoring' into 'master'	Kamil Trzciński	2017-09-20	1	-4/+0
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support new auto-deploy helm chart Closes #38028 See merge request gitlab-org/gitlab-ce!14386
\| * \| \| \| \| \| \|	Support new auto-deploy helm chartfix-autodevops-monitoring	Alessio Caiazza	2017-09-20	1	-4/+0
\| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	New auto-deploy helm chart has new names in order to support Auto Monitoring. Works with, but does not require charts/charts.gitlab.io!66 See gitlab-ce#38028
* \| \| \| \| \| \|	Merge branch '37713-enable-ee_compat_check-for-forks' into 'master'	Rémy Coutable	2017-09-20	3	-4/+12
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable ee_compat_check for forks, but not EE Closes #37713 See merge request gitlab-org/gitlab-ce!14189
\| * \| \| \| \| \| \|	Update ee_compat_check for community contributors37713-enable-ee_compat_check-for-forks	Lin Jen-Shin	2017-09-15	1	-1/+6
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Enable ee_compat_check for forks, but not EE	Lin Jen-Shin	2017-09-15	2	-3/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We exclude known EE projects, and check the project directory name for EE forks.
* \| \| \| \| \| \| \|	Merge branch '36884-gitaly-admin-version' into 'master'	Tim Zallmann	2017-09-20	3	-2/+17
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Gitaly version to Admin Dashboard Closes #36884 See merge request gitlab-org/gitlab-ce!14313
\| * \| \| \| \| \| \| \|	Add Gitaly version to Admin Dashboard	Jacopo	2017-09-19	3	-2/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Displays the Gitaly version in the admin dashboard.
* \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \| \|	Fix rewriting issue references with group milestones	Grzegorz Bizon	2017-09-20	7	-24/+77
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch '20049-projects-api-forks' into 'master'	Rémy Coutable	2017-09-20	7	-9/+221
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "make project data via API report forks of this project" Closes #20049 See merge request gitlab-org/gitlab-ce!14355
\| * \| \| \| \| \| \| \|	Employ ForkProjectsFinder in ForksController	Mark Fletcher	2017-09-20	1	-5/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add an API endpoint to determine the forks of a project	Mark Fletcher	2017-09-20	4	-4/+169
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Introduce ForkProjectsFinder class	Mark Fletcher	2017-09-20	2	-0/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Will dry up the code to find projects between the ForksController and the API
* \| \| \| \| \| \| \| \|	Merge branch 'add_tooltip_for_milestone_in_issues_list' into 'master'	Douwe Maan	2017-09-20	5	-4/+15
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add tooltip for milestone due date to issue and merge request lists Closes #18864 See merge request gitlab-org/gitlab-ce!14318
\| * \| \| \| \| \| \| \| \|	Add tooltip for milestone due date to issue and merge request lists	Vitaliy @blackst0ne Klachkov	2017-09-20	5	-4/+15
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'mk-clarify-moving-namespaces' into 'master'	Douwe Maan	2017-09-20	5	-9/+52
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify how to rename username or group path See merge request gitlab-org/gitlab-ce!13914
\| * \| \| \| \| \| \| \| \| \|	Add changelog entrymk-clarify-moving-namespaces	Michael Kozono	2017-09-19	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add "Changing your username" section to docs	Michael Kozono	2017-09-19	2	-4/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	And link to it from where you change your username.
\| * \| \| \| \| \| \| \| \| \|	Move help for renaming group path to docs	Michael Kozono	2017-09-19	2	-5/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	And expand on the help text.