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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Catch all URI errors in ExternalLinkFilterdm-catch-uri-errors	Douwe Maan	2017-05-18	3	-1/+12
\|
*	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
\| * \| \| \| \| \| \| \|	Remove duplicate cache invalidation from IssuableBaseService	Rémy Coutable	2017-05-18	1	-1/+0
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'change_migration_style_guide' into 'master'	Yorick Peterse	2017-05-18	1	-0/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Migration guide] Add a note about prefering change_column_null over change_column See merge request !11473
\| * \| \| \| \| \| \| \| \|	[Migration guide] Add note about prefering change_column_null over change_columnchange_migration_style_guide	Valery Sizov	2017-05-18	1	-0/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix_set_null_false_migration' into 'master'	Yorick Peterse	2017-05-18	1	-4/+4
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adding NULL:false constraint with change_column_null instead of change_column Closes #32450 See merge request !11471
\| * \| \| \| \| \| \| \| \|	Adding NULL:false constraint with change_column_null instead of change_columnfix_set_null_false_migration	Valery Sizov	2017-05-18	1	-4/+4
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'docs/refactor-pipeline-schedules' into 'master'	Sean Packham (GitLab)	2017-05-18	8	-48/+81
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor pipeline schedules docs See merge request !11470
\| * \| \| \| \| \| \| \| \|	Refactor pipeline schedules docs	Achilleas Pipinellis	2017-05-18	8	-48/+81
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch '32359-align-resolve-btn' into 'master'	Filipa Lacerda	2017-05-18	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Align resolve comment btn Closes #32359 See merge request !11457
\| * \| \| \| \| \| \| \|	Align resolve comment btn32359-align-resolve-btn	Annabel Dunstone Gray	2017-05-17	1	-3/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'sh-fix-container-registry-s3-redirects' into 'master'	Kamil Trzciński	2017-05-18	4	-5/+54
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Properly handle container registry redirects to fix metadata stored on an S3 backend Closes #22403 See merge request !11429
\| * \| \| \| \| \| \| \| \|	Properly handle container registry redirects to fix metadata stored on a S3 ↵sh-fix-container-registry-s3-redirects	Stan Hu	2017-05-17	4	-5/+54
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	backend The previous behavior would include the Authorization header, which would make fetching an S3 blob fail quietly. Closes #22403 Update sh-fix-container-registry-s3-redirects.yml
* \| \| \| \| \| \| \| \| \|	Merge branch '32449-fix-note-comparison-trailing-newline-edge-case' into ↵	Phil Hughes	2017-05-18	5	-63/+144
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Fix note flicker with note you can't edit and trailing new line edge case Closes #32449 See merge request !11472
\| * \| \| \| \| \| \| \| \| \|	Fix missing .original-note-content and trailing new line edge case32449-fix-note-comparison-trailing-newline-edge-case	Eric Eastwood	2017-05-18	5	-63/+144
\| \| \|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32449
* \| \| \| \| \| \| \| \| \|	Merge branch 'docs-add-api-to-all-headings' into 'master'	Sean Packham (GitLab)	2017-05-18	28	-33/+24
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add "API" to all respective headings (h1s) Closes #32307 See merge request !11450
\| * \| \| \| \| \| \| \| \| \|	Add "API" to all respective headings (h1s)	Marcia Ramos	2017-05-18	28	-33/+24
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch ↵	Phil Hughes	2017-05-18	4	-6/+18
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'32086-atwho-is-still-enabled-for-personal-snippet-comments-form' into 'master' Disable reference prefixes in notes for Snippets Closes #32086 See merge request !11278
\| * \| \| \| \| \| \| \| \|	Disable reference prefixes in notes for Snippets	Sam Rose	2017-05-18	4	-6/+18
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'dz-codeclimate-doc' into 'master'	Achilleas Pipinellis	2017-05-18	3	-0/+30
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Code Climate CLI example to CI documentation See merge request !11368
\| * \| \| \| \| \| \| \|	Add Code Climate CLI example to CI documentation	Dmitriy Zaporozhets	2017-05-18	3	-0/+30
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch ↵	Phil Hughes	2017-05-18	4	-21/+21
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'31987-automatically-close-assignee-select-dropdown-after-selection-when-multiple-assignees-is-disabled' into 'master' Automatically close user dropdown for CE Closes #31987 See merge request !11189
\| * \| \| \| \| \| \| \|	Remove unnecessary hidden()31987-automatically-close-assignee-select-dropdown-after-selection-when-multiple-assignees-is-disabled	Clement Ho	2017-05-17	1	-2/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Use to toggle the dropdown	Clement Ho	2017-05-17	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix form spec	Clement Ho	2017-05-16	2	-22/+8
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add test.js and test.css to disable animations during testing and include ↵	Luke "Jared" Bennett	2017-05-16	5	-0/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	these in _head when testing
\| * \| \| \| \| \| \| \|	Fix rubocop	Clement Ho	2017-05-16	2	-4/+4
\| \| \| \| \| \| \| \| \|