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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update edit.html.hamlpatch-21	Fabio Busatto	2017-05-18	1	-1/+1
\| \| \|	Closes #32555
*	Merge branch 'tc-fix-broken-plain-readme' into 'master'	Douwe Maan	2017-05-18	2	-0/+15
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix ProjectCacheWorker for plain READMEs Closes #32540 See merge request !11506
\| *	Fix ProjectCacheWorker for plain READMEs	Toon Claes	2017-05-18	2	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \|	The ProjectCacheWorker refreshes cache periodically, but it runs outside Rails context. So include the ActionView helpers so the `content_tag` method is available.
* \|	Merge branch 'bvl-fix-incorrectly-renamed-routes' into 'master'	Douwe Maan	2017-05-18	5	-2/+51
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes for the rename reserved paths helpers Closes #32528 See merge request !11492
\| * \|	Fixes for the rename reserved paths helpers	Bob Van Landuyt	2017-05-18	5	-2/+51
\|/ /
* \|	Merge branch 'rubocop-empty-example-group' into 'master'	Robert Speicher	2017-05-18	6	-37/+33
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Enable the RSpec/EmptyExampleGroup cop See merge request !11497
\| * \|	Enable the RSpec/EmptyExampleGroup coprubocop-empty-example-group	Rémy Coutable	2017-05-18	6	-37/+33
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Merge branch 'rubocop-expect-output' into 'master'	Robert Speicher	2017-05-18	4	-18/+15
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \|	Enable the RSpec/ExpectOutput cop See merge request !11500
\| * \|	Enable the RSpec/ExpectOutput coprubocop-expect-output	Rémy Coutable	2017-05-18	4	-18/+15
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Merge branch 'remove-services-count-from-usage-ping-data' into 'master'	Stan Hu	2017-05-18	2	-2/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove Services count from usage ping payload. Closes gitlab-ee#2241 See merge request !11499
\| * \| \|	Remove Services count from usage ping payload.	Ruben Davila	2017-05-18	2	-2/+0
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	This query was timing out and is blocking the sync of usage data for GitLab.com
* \| \|	Merge branch '32425-fix-diff-notes-instant-editing' into 'master'	Phil Hughes	2017-05-18	2	-3/+44
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix ability to edit diff notes multiple times Closes #32425 See merge request !11456
\| * \| \|	Fix ability to edit diff notes multiple times	Kushal Pandya	2017-05-18	2	-3/+44
\|/ / /
* \| \|	Merge branch 'winh-testing-promises' into 'master'	Clement Ho	2017-05-18	1	-0/+62
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \|	Document Promise testing best practice See merge request !11284
\| * \|	Document Promise testing best practice (!11284)winh-testing-promises	winh	2017-05-17	1	-0/+62
\| \| \|
* \| \|	Merge branch 'dm-gemfile-viewer'	Rémy Coutable	2017-05-18	23	-7/+449
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \|	See merge request !11346.
\| * \|	Fix inaccurate code commentdm-gemfile-viewer	Douwe Maan	2017-05-18	1	-1/+1
\| \| \|
\| * \|	Add auxiliary blob viewers to dependency files	Douwe Maan	2017-05-17	23	-7/+449
\| \| \|
* \| \|	Merge branch 'fix-trailing-space-mr-widget' into 'master'	Fatih Acet	2017-05-18	2	-4/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactored the anchor tag to remove the trailing space in the target branch Closes #32445 See merge request !11463
\| * \| \|	Refactored the anchor tag to remove the trailing space in the target branchfix-trailing-space-mr-widget	Jose Ivan Vargas	2017-05-17	2	-4/+5
\| \| \| \|
* \| \| \|	Merge branch 'docs-apiv3-removal-msg' into 'master'	Douwe Maan	2017-05-18	1	-1/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make API v3 removal date more clear/match blog post See merge request !11482
\| * \| \| \|	Reworddocs-apiv3-removal-msg	Drew Blessing	2017-05-18	1	-3/+3
\| \| \| \| \|
\| * \| \| \|	Match v3 case	Drew Blessing	2017-05-18	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Make API v3 removal date more clear/match blog post	Drew Blessing	2017-05-18	1	-1/+3
\| \| \| \| \|
* \| \| \| \|	Merge branch 'change-url-in-specific-runners-registration-steps' into 'master'	Kamil Trzciński	2017-05-18	4	-10/+10
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove references to '/ci' path while describing Runner's registration See merge request !10518
\| * \| \| \| \|	Remove references to '/ci' path while describing Runner's registrationchange-url-in-specific-runners-registration-steps	Tomasz Maczukin	2017-05-15	4	-10/+10
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'mk-fix-issue-1843' into 'master'	Douwe Maan	2017-05-18	3	-5/+15
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix root groups redirecting to group owner Closes #32474 See merge request !11465
\| * \| \| \| \| \|	Use Namespace.for_user scope (formerly known as Namespace.root)mk-fix-issue-1843	Douwe Maan	2017-05-18	2	-5/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fixes #32474	Michael Kozono	2017-05-17	2	-4/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Older namespace records may be both `type == ‘Group` AND `owner_id` is not null.
* \| \| \| \| \| \|	Merge branch 'fix_removing_invited_member' into 'master'	Rémy Coutable	2017-05-18	4	-1/+34
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix: Deleting an invited member causes 500 error Closes #32504 See merge request !11481
\| * \| \| \| \| \| \|	Fix: Deleting an invited member causes 500 error	Valery Sizov	2017-05-18	4	-1/+34
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '31562-fix-test_env-set_repo_refs-rspec-profile' into 'master'	Robert Speicher	2017-05-18	2	-37/+36
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "TestEnv#set_repo_refs fails to update refs sometimes" Closes #31562 See merge request !11253
\| * \| \| \| \| \| \| \|	Shorten the last two commit SHA, because CONSISTENCY31562-fix-test_env-set_repo_refs-rspec-profile	Rémy Coutable	2017-05-18	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	If TestEnv#set_repo_refs fails, clean test repos and retry	Rémy Coutable	2017-05-18	2	-26/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sometimes, new references are not retrieved when a `git fetch` is called in a bare repos. The easiest solution is to cleanup the test repos and retry in this case. This only happens when a new ref is added to TestEnv::BRANCH_SHA or TestEnv::FORKED_BRANCH_SHA. Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	Factorize TestEvent#copy_repo	Rémy Coutable	2017-05-18	2	-13/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \|	Merge branch 'fix-update-knapsack-job' into 'master'	Robert Speicher	2017-05-18	1	-4/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Knapsack report names for RSpec and Spinach See merge request !11477
\| * \| \| \| \| \| \| \| \|	Fix Knapsack report names for RSpec and Spinachfix-update-knapsack-job	Rémy Coutable	2017-05-18	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \|	Merge branch 'dm-empty-tree-readme' into 'master'	Robert Speicher	2017-05-18	1	-7/+8
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't blow up when a tree readme is empty and consequently has no rich viewer Closes #32396 See merge request !11459
\| * \| \| \| \| \| \| \| \| \|	Don't blow up when a tree readme is empty and consequently has no rich viewerdm-empty-tree-readme	Douwe Maan	2017-05-17	1	-7/+8
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'gitaly-local-branches' into 'master'	Douwe Maan	2017-05-18	14	-32/+196
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Incorporate Gitaly's local_branches operation into repo code Closes #27379 See merge request !10059
\| * \| \| \| \| \| \| \| \| \| \|	Incorporate Gitaly's local_branches operation into repo codegitaly-local-branches	Alejandro Rodríguez	2017-05-17	10	-23/+198
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Compare ids of commits if present for equality test	Alejandro Rodríguez	2017-05-16	1	-7/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This solves a problem where commits populated with Gitaly were not equal to commits populated with Rugged. This is because Gitaly may not return all fields of a commit for optimizations purposes, which resulted in false negatives when comparing the same commit (commits with the same sha) with different sources.
\| * \| \| \| \| \| \| \| \| \| \|	Clean import of shared examples for protected branches/tags	Alejandro Rodríguez	2017-05-16	4	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '32424-fix-linking-to-unresolved-expanded-diff-note' into 'master'	Phil Hughes	2017-05-18	3	-8/+49
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix linking to unresolved/expanded diff note Closes #32424 See merge request !11458
\| * \| \| \| \| \| \| \| \| \| \|	Fix linking to unresolved/expanded diff note32424-fix-linking-to-unresolved-expanded-diff-note	Eric Eastwood	2017-05-17	3	-8/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32424 Bug introduced in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11327
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '32465-center' into 'master'	Annabel Dunstone Gray	2017-05-18	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	recenter profile page nav links Closes #32465 See merge request !11464
\| * \| \| \| \| \| \| \| \| \| \|	recenter profile page nav links32465-center	Simon Knox	2017-05-18	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'add-current_user-avatar_url-to-gon' into 'master'	Phil Hughes	2017-05-18	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add current_user_avatar_url to gon See merge request !11474
\| * \| \| \| \| \| \| \| \| \| \|	Add current_user_avatar_url to gonadd-current_user-avatar_url-to-gon	Luke "Jared" Bennett	2017-05-18	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'backport-ce-upstream-change' into 'master'	Rémy Coutable	2017-05-18	1	-1/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove duplicate cache invalidation from IssuableBaseService See merge request !11475