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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
* \| \| \| \| \| \| \|	Merge branch '38325-variables-usage-in-gitlab-ci-yml-docs' into 'master'	Achilleas Pipinellis	2018-05-29	4	-52/+135
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add documentation about variables usage in GitLab CI Closes #38325 See merge request gitlab-org/gitlab-ce!19075
\| * \| \| \| \| \| \| \|	Add documentation about variables usage in GitLab CI	Tomasz Maczukin	2018-05-29	4	-52/+135
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'ab-35364-throttle-updates-last-repository-at' into 'master'	Yorick Peterse	2018-05-29	3	-0/+20
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Throttle updates to Project#last_repository_updated_at. Closes #35364 See merge request gitlab-org/gitlab-ce!19183
\| * \| \| \| \| \| \| \|	Throttle updates to Project#last_repository_updated_at.	Andreas Brandl	2018-05-29	3	-0/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #35364.
* \| \| \| \| \| \| \| \|	Merge branch '46758-fallout-of-cacheable-attribute' into 'master'	Douwe Maan	2018-05-29	13	-168/+183
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure ApplicationSetting#performance_bar_allowed_group_id is properly set when retrieved from cache Closes #46758 See merge request gitlab-org/gitlab-ce!19144
\| * \| \| \| \| \| \| \| \|	Allow comment after if/unless clause46758-fallout-of-cacheable-attribute	Rémy Coutable	2018-05-29	2	-1/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \| \|	Ensure ApplicationSetting#performance_bar_allowed_group_id is properly set ↵	Rémy Coutable	2018-05-29	11	-167/+170
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	when retrieved from cache Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \|	Merge branch '46885-group-visibility' into 'master'	Clement Ho	2018-05-29	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Visibility section alignment is broken" Closes #46885 See merge request gitlab-org/gitlab-ce!19204
\| * \| \| \| \| \| \| \| \| \|	Fix alignment of visibility options on new group page	Annabel Dunstone Gray	2018-05-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'bootstrap-fixes-from-ee' into 'master'	Annabel Gray	2018-05-29	3	-4/+4
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add bootstrap fixes that were in EE but were mismatching in CE See merge request gitlab-org/gitlab-ce!19155
\| * \| \| \| \| \| \| \| \| \| \|	Add bootstrap fixes that were in EE but were mismatching in CE	Clement Ho	2018-05-29	3	-4/+4
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch '46849-update-rdoc-to-6-0-4' into 'master'	Robert Speicher	2018-05-29	3	-4/+8
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update rdoc to 6.0.4 Closes #46849 See merge request gitlab-org/gitlab-ce!19167
\| * \| \| \| \| \| \| \| \| \|	Update rdoc to 6.0.4	Takuya Noguchi	2018-05-27	3	-4/+8
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'branches-fixes' into 'master'	Clement Ho	2018-05-29	2	-2/+6
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix branches panel at smaller screen sizes See merge request gitlab-org/gitlab-ce!19157
\| * \| \| \| \| \| \| \| \| \| \|	Fix branches panel at smaller screen sizesbranches-fixes	Annabel Dunstone Gray	2018-05-25	2	-2/+6
\| \|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch '46852-remove-always-on-spinner' into 'master'	Clement Ho	2018-05-29	4	-21/+32
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Merge request spinner spins forever after loading the diff" Closes #46852 See merge request gitlab-org/gitlab-ce!19188
\| * \| \| \| \| \| \| \| \| \|	Resolve "Merge request spinner spins forever after loading the diff"	Lukas Eipert	2018-05-29	4	-21/+32
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'patch-26' into 'master'	Achilleas Pipinellis	2018-05-29	1	-1/+10
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ensure UIDs and GIDs match for HA setup Closes omnibus-gitlab#2138 See merge request gitlab-org/gitlab-ce!19054
\| * \| \| \| \| \| \| \| \| \|	ensure UIDs and GIDs match for HA setup	Ben Bodenmiller	2018-05-29	1	-1/+10
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch '44602-clarify-update-docs-text-about-restrictions' into 'master'	Achilleas Pipinellis	2018-05-29	3	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Clarify/Update docs/text about restrictions." See merge request gitlab-org/gitlab-ce!17970
\| * \| \| \| \| \| \| \| \| \|	include groups in description	Davin Walker	2018-05-28	3	-3/+3
\| \| \| \| \| \| \| \| \| \| \|