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

	Commit message (Collapse)	Author	Age	Files	Lines
*	removed CHANGELOG as their are no user facing components in this merge requestide-list-merge-requests	Phil Hughes	2018-05-30	1	-5/+0
\|
*	ability to search merge requests	Phil Hughes	2018-05-30	4	-10/+39
\| \| \| \|	reset merge requests before fetch
*	improved stored data	Phil Hughes	2018-05-30	6	-3/+45
\| \| \| \|	created reset action to reset stored merge requests
*	Merge branch 'master' into ide-list-merge-requests	Phil Hughes	2018-05-30	989	-5362/+8631
\|\
\| *	Merge branch 'blackst0ne-squash-and-merge-in-gitlab-core-ce' into 'master'	Phil Hughes	2018-05-30	41	-64/+840
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Squash and merge in GitLab Core (CE)" Closes #34591 See merge request gitlab-org/gitlab-ce!18956
\| \| *	Add 'squash and rebase' feature to CEblackst0ne-squash-and-merge-in-gitlab-core-ce	blackst0ne	2018-05-29	41	-64/+840
\| \| \|
\| * \|	Merge branch '46844-update-awesome_print-to-1-8-0' into 'master'	Dmitriy Zaporozhets	2018-05-30	3	-3/+8
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update awesome_print to 1.8.0 Closes #46844 See merge request gitlab-org/gitlab-ce!19163
\| \| * \|	Update awesome_print to 1.8.0	Takuya Noguchi	2018-05-29	3	-3/+8
\| \| \| \|
\| * \| \|	Merge branch 'bootstrap-pull-float' into 'master'	Annabel Gray	2018-05-30	8	-15/+15
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Convert remaining pull-* to float-* Closes #46934 See merge request gitlab-org/gitlab-ce!19225
\| \| * \| \|	Convert remaining pull-* to float-*	Clement Ho	2018-05-29	8	-15/+15
\| \| \| \| \|
\| * \| \| \|	Merge branch 'fix-snippet-row' into 'master'	Annabel Gray	2018-05-30	1	-1/+1
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix snippet row Closes #46820 See merge request gitlab-org/gitlab-ce!19218
\| \| * \| \| \|	Fix snippet row	Clement Ho	2018-05-29	1	-1/+1
\| \| \|/ / /
\| * \| \| \|	Merge branch '46877-bootstrap-4-lists' into 'master'	Clement Ho	2018-05-30	21	-33/+33
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve ""well-list" is removed from Bootstrap 4" Closes #46877 See merge request gitlab-org/gitlab-ce!19207
\| \| * \| \| \|	Remove duplicate classes	Annabel Dunstone Gray	2018-05-29	1	-2/+2
\| \| \| \| \| \|
\| \| * \| \| \|	Replace well-list with content-list and hover-list	Annabel Dunstone Gray	2018-05-29	22	-34/+34
\| \| \| \|/ / \| \| \|/\| \|
\| * \| \| \|	Merge branch 'bootstrap-emails-verify-badge' into 'master'	Annabel Gray	2018-05-30	3	-3/+3
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix email verification badge Closes #46818 See merge request gitlab-org/gitlab-ce!19217
\| \| * \| \| \|	Fix email verification badge	Clement Ho	2018-05-29	3	-3/+3
\| \| \| \|/ / \| \| \|/\| \|
\| * \| \| \|	Merge branch 'sh-bump-rugged-to-0.27.1' into 'master'	Robert Speicher	2018-05-29	1	-1/+1
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump rugged to 0.27.1 for security fixes See merge request gitlab-org/gitlab-ce!19222
\| \| * \| \| \|	Bump rugged to 0.27.1 for security fixes	Stan Hu	2018-05-29	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'sh-ruby-cache-key-debian-stretch' into 'master'	Robert Speicher	2018-05-29	1	-2/+2
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade cache key to be clear that Debian Stretch is being used See merge request gitlab-org/gitlab-ce!19214
\| \| * \| \| \|	Upgrade cache key to be clear that Debian Stretch is being used	Stan Hu	2018-05-29	1	-2/+2
\| \| \| \|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes build errors caused by a stale cache since the new Docker image upgraded from Debian Jessie to Stretch, which shipped an updated version of OpenSSL.
\| * \| \| \|	Merge branch 'bootstrap-ide-new-file-modal' into 'master'	Annabel Gray	2018-05-29	2	-18/+12
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix web IDE new entry modal form alignment Closes #46933 See merge request gitlab-org/gitlab-ce!19210
\| \| * \| \|	Fix web IDE new entry modal form alignment	Clement Ho	2018-05-29	2	-18/+12
\| \| \| \| \|
\| * \| \| \|	Merge branch '6045-extract-ee-specific-specs-lines' into 'master'	Robert Speicher	2018-05-29	12	-53/+110
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE] Resolve "Extract EE specific files/lines for some controller specs" Closes #6045 See merge request gitlab-org/gitlab-ce!19089
\| \| * \| \| \|	Try to fetch the CE branch in EE because sometimes it has the same name6045-extract-ee-specific-specs-lines	Rémy Coutable	2018-05-24	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| \| * \| \| \|	Reduce CE/EE diff in ↵	Rémy Coutable	2018-05-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	spec/controllers/projects/project_members_controller_spec.rb Signed-off-by: Rémy Coutable <remy@rymai.me>
\| \| * \| \| \|	Reduce CE/EE diff in spec/controllers/projects/issues_controller_spec.rb	Rémy Coutable	2018-05-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| \| * \| \| \|	Reduce CE/EE diff in spec/controllers/projects/imports_controller_spec.rb	Rémy Coutable	2018-05-24	1	-12/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| \| * \| \| \|	Reduce CE/EE diff in spec/controllers/projects/group_links_controller_spec.rb	Rémy Coutable	2018-05-24	1	-0/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| \| * \| \| \|	Reduce CE/EE diff in spec/controllers/projects/environments_controller_spec.rb	Rémy Coutable	2018-05-24	2	-0/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| \| * \| \| \|	Reduce CE/EE diff in app/controllers/projects/clusters_controller.rb	Rémy Coutable	2018-05-24	2	-18/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| \| * \| \| \|	Reduce CE/EE diff in spec/controllers/projects/branches_controller_spec.rb	Rémy Coutable	2018-05-24	1	-0/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| \| * \| \| \|	Reduce CE/EE diff in spec/controllers/projects/boards_controller_spec.rb	Rémy Coutable	2018-05-24	1	-18/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| \| * \| \| \|	Reduce CE/EE diff in spec/controllers/boards/issues_controller_spec.rb	Rémy Coutable	2018-05-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \|	Merge remote-tracking branch 'dev/master'	Mayra Cabrera	2018-05-29	19	-24/+186
\| \|\ \ \ \ \
\| \| * \ \ \ \	Merge branch 'security-fj-import-export-assignment' into 'master'	Mayra Cabrera	2018-05-29	12	-18/+93
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[master] Arbitrary assignment of Project fields using "Import project" from a Gitlab tar.gz Closes #2678 See merge request gitlab/gitlabhq!2378
\| \| \| * \| \| \| \|	Blacklisting attributes in the project import process	Francisco Javier López	2018-05-14	12	-18/+93
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge branch 'security-dm-delete-deploy-key' into 'master'	Mayra Cabrera	2018-05-29	3	-4/+47
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[master] Fix API to remove deploy key from project instead of deleting it entirely See merge request gitlab/gitlabhq!2379
\| \| \| * \| \| \| \| \|	Fix API to remove deploy key from project instead of deleting it entirely	Douwe Maan	2018-05-04	3	-4/+47
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge branch ↵	Mayra Cabrera	2018-05-29	3	-2/+18
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'security-users-can-update-their-password-without-entering-current-password' into 'master' [Master] No longer allow password change without previous password being provided See merge request gitlab/gitlabhq!2383
\| \| \| * \| \| \| \| \| \|	Remove password and password_confirmation from whitelisted params in ↵	Tiago Botelho	2018-05-07	3	-2/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ProfilesController to prevent password from being changed without previous password being provided
\| \| * \| \| \| \| \| \| \|	Update CHANGELOG.md for 10.8.2	Filipa Lacerda	2018-05-28	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| \| * \| \| \| \| \| \| \|	Update CHANGELOG.md for 10.7.5	Filipa Lacerda	2018-05-28	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| \| * \| \| \| \| \| \| \|	Update CHANGELOG.md for 10.6.6	Filipa Lacerda	2018-05-28	1	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \|	Merge branch 'bootstrap-help-block' into 'master'	Annabel Gray	2018-05-29	13	-16/+16
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace help-block with form-text.text-muted Closes #46745 See merge request gitlab-org/gitlab-ce!19206
\| \| * \| \| \| \| \| \| \| \|	Replace help-block with form-text.text-muted	Clement Ho	2018-05-29	13	-16/+16
\| \| \| \|_\|_\|_\|_\|/ / / \| \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'bootstrap-job-log' into 'master'	Annabel Gray	2018-05-29	1	-0/+4
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Auto wrap job logs Closes #46705 See merge request gitlab-org/gitlab-ce!19209
\| \| * \| \| \| \| \| \| \| \|	Auto wrap job logs	Clement Ho	2018-05-29	1	-0/+4
\| \| \|/ / / / / / / /
\| * \| \| \| \| \| \| \| \|	Merge branch 'sh-batch-dependent-destroys' into 'master'	Robert Speicher	2018-05-29	5	-1/+101
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix project destruction failing due to idle in transaction timeouts Closes #44610 See merge request gitlab-org/gitlab-ce!18609
\| \| * \| \| \| \| \| \| \| \|	Fix project destruction failing due to idle in transaction timeoutssh-batch-dependent-destroys	Stan Hu	2018-05-24	5	-1/+101
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When deleting associated records, Rails loads all associations into memory (https://github.com/rails/rails/issues/22510) before destroying them. This can cause a surge in memory and cause destruction of objects to fail due to idle in transaction database timeouts. This fix is inspired from https://github.com/thisismydesign to destroy `has_many` relationships in batches. Closes #44610