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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update VERSION to 10.6.1v10.6.1	Filipa Lacerda	2018-03-27	1	-1/+1
\|
*	Update CHANGELOG.md for 10.6.1	Filipa Lacerda	2018-03-27	6	-25/+20
\| \| \|	[ci skip]
*	Merge branch '10-6-stable-patch-1' into '10-6-stable'	James Lopez	2018-03-27	2	-1/+6
\|\ \| \| \| \| \| \| \| \|	Prepare 10.6.1 release See merge request gitlab-org/gitlab-ce!17989
\| *	Merge branch 'bug/44103-ie11-compatibility' into 'master'10-6-stable-patch-1	Fatih Acet	2018-03-26	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Array.fill polyfill for IE 11 compatibility. Closes #44103 See merge request gitlab-org/gitlab-ce!17897
\| *	Merge branch 'docs/rs-update-changelog' into 'master'	Douwe Maan	2018-03-26	1	-1/+5
\|/ \| \| \| \| \| \|	Add missing changelog entries for 10.6.0 See merge request gitlab-org/gitlab-ce!17973 [ci skip]
*	Merge branch '10-6-stable-patch-1' into '10-6-stable'	Robert Speicher	2018-03-23	31	-60/+957
\|\ \| \| \| \| \| \| \| \|	Prepare 10.6.1 release See merge request gitlab-org/gitlab-ce!17938
\| *	Merge branch ↵	Stan Hu	2018-03-23	7	-17/+73
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'44564-error-500-while-attempting-to-resolve-conflicts-due-to-utf-8-conversion-error' into 'master' Resolve "Error 500 while attempting to resolve conflicts due to UTF-8 conversion error" Closes #44564 See merge request gitlab-org/gitlab-ce!17962
\| *	Merge branch 'fix/encoding-helper-clean-blowing-up-on-utf-16be' into 'master'	Robert Speicher	2018-03-23	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix EncodingHelper#clean blowing up on UTF-16BE strings Closes gitaly#1101 See merge request gitlab-org/gitlab-ce!17943
\| *	Merge branch 'sh-update-loofah' into 'master'	Robert Speicher	2018-03-23	3	-5/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump loofah to 2.2.2 and rails-html-sanitizer to 1.0.4 Closes #44554 See merge request gitlab-org/gitlab-ce!17945
\| *	Merge branch 'docs/ci-caching' into 'master'	Marcia Ramos	2018-03-23	4	-22/+702
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add docs on CI caching Closes #32515, #18945, and gitlab-runner#1621 See merge request gitlab-org/gitlab-ce!12183
\| *	Merge branch 'fix-ci-job-auto-retry' into 'master'	Grzegorz Bizon	2018-03-23	3	-1/+39
\| \| \| \| \| \| \| \| \| \|	Prevent auto-retry AccessDenied error from stopping transition to failed See merge request gitlab-org/gitlab-ce!17862
\| *	Merge branch 'ee-5063-to-ce-backport' into 'master'	Douwe Maan	2018-03-23	3	-5/+5
\| \| \| \| \| \| \| \| \| \|	Backports changes made in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5063 to CE See merge request gitlab-org/gitlab-ce!17909
\| *	Merge branch 'ab-44446-add-indexes-for-user-activity-queries' into 'master'	Yorick Peterse	2018-03-23	3	-1/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add indexes for user activity queries. Closes #44446 See merge request gitlab-org/gitlab-ce!17890
\| *	Merge branch 'jramsay-maintainers-can-edit-docs' into 'master'	Marcia Ramos	2018-03-23	1	-4/+9
\| \| \| \| \| \| \| \| \| \|	Update merge request maintainer access docs See merge request gitlab-org/gitlab-ce!17864
\| *	Merge branch 'update-cloud-native-chart-docs' into 'master'	Marcia Ramos	2018-03-23	1	-2/+2
\| \| \| \| \| \| \| \| \| \|	Update cloud native Helm chart docs for alpha See merge request gitlab-org/gitlab-ce!17875
\| *	Merge branch '44232-docs-for-runner-ip-address' into 'master'	Kamil Trzciński	2018-03-23	4	-0/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Add documentation for "Display IP Address Of Runner On Runner Page"" Closes #44232 See merge request gitlab-org/gitlab-ce!17837
\| *	Merge branch 'fix/sm/erase_old_trace' into 'master'	Kamil Trzciński	2018-03-23	2	-2/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use update_column than write_attribute and save Closes #44366 See merge request gitlab-org/gitlab-ce!17861
* \|	Update VERSION to 10.6.0v10.6.0	James Lopez	2018-03-22	1	-1/+1
\| \|
* \|	Update CHANGELOG.md for 10.6.0	James Lopez	2018-03-22	170	-845/+184
\|/ \| \|	[ci skip]
*	Merge branch 'sh-lograge-strip-location-header' into 'master'	Robert Speicher	2018-03-21	1	-0/+18
\| \| \| \| \|	Strip any query string parameters from Location headers from lograge See merge request gitlab-org/gitlab-ce!17895
*	Update VERSION to 10.6.0-rc7v10.6.0-rc7	James Lopez	2018-03-20	1	-1/+1
\|
*	Merge branch '10-6-stable-prepare-rc7' into '10-6-stable'	Robert Speicher	2018-03-19	52	-326/+730
\|\ \| \| \| \| \| \| \| \|	Prepare 10.6-rc7 See merge request gitlab/gitlabhq!2362
\| *	Merge branch 'jl-add-custom-metrics-docs' into 'master'	Marcia Ramos	2018-03-19	1	-13/+17
\| \| \| \| \| \| \| \| \| \|	Improvements for prometheus metrics documentation See merge request gitlab-org/gitlab-ce!17838
\| *	Merge branch '44330-docs-for-ingress-ip' into 'master'	Achilleas Pipinellis	2018-03-19	2	-0/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Add documentation for "Display ingress IP address in the Kubernetes page"" Closes #44330, #42761, and #43526 See merge request gitlab-org/gitlab-ce!17836
\| *	Merge branch 'sh-admin-projects-remove-n-plus-one' into 'master'	Robert Speicher	2018-03-19	2	-0/+11
\| \| \| \| \| \| \| \| \| \|	Remove N+1 queries in /admin/projects page See merge request gitlab-org/gitlab-ce!17834
\| *	Merge branch 'sh-fix-failure-project-destroy' into 'master'	Robert Speicher	2018-03-19	2	-1/+10
\| \| \| \| \| \| \| \| \| \|	Fix "Can't modify frozen hash" error when project is destroyed See merge request gitlab-org/gitlab-ce!17816
\| *	Merge branch 'profile-notifications-dropdown-fix' into 'master'	Filipa Lacerda	2018-03-19	2	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed profile notifications not being editable Closes #44198 See merge request gitlab-org/gitlab-ce!17808
\| *	Merge branch 'update_vendored_gitlab_ci_yml' into 'master'	Robert Speicher	2018-03-19	1	-6/+5
\| \| \| \| \| \| \| \| \| \|	Update vendored gitlab-ci.yml template for auto-devops See merge request gitlab-org/gitlab-ce!17804
\| *	Merge branch 'gitaly-0.91.0' into 'master'	Robert Speicher	2018-03-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	Use Gitaly 0.91.0 See merge request gitlab-org/gitlab-ce!17802
\| *	Merge branch 'docs-update_code_quality_example' into 'master'	Achilleas Pipinellis	2018-03-19	1	-7/+15
\| \| \| \| \| \| \| \| \| \|	Update Code Quality example documentation See merge request gitlab-org/gitlab-ce!17788
\| *	Merge branch 'sh-optimize-admin-projects-page' into 'master'	Robert Speicher	2018-03-19	2	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix timeouts loading /admin/projects page Closes #44338 See merge request gitlab-org/gitlab-ce!17785
\| *	Merge branch 'fix-dropzone-project-show' into 'master'	Jacob Schatz	2018-03-19	3	-4/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix dropzone project show Closes #44137 See merge request gitlab-org/gitlab-ce!17784
\| *	Merge branch 'sh-cache-table-exists' into 'master'	Yorick Peterse	2018-03-19	4	-1/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cache table_exists?('application_settings') to reduce repeated schema reloads Closes #43355 See merge request gitlab-org/gitlab-ce!17781
\| *	Merge branch 'sh-cache-column-exists' into 'master'	Yorick Peterse	2018-03-19	4	-3/+23
\| \| \| \| \| \| \| \| \| \|	Cache column_exists? for application settings See merge request gitlab-org/gitlab-ce!17780
\| *	Merge branch 'fix/sm/clarify-ambiguous-with_artifacts-implication' into 'master'	Kamil Trzciński	2018-03-19	6	-7/+55
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify ambiguous with_artifacts implication Closes #44138 See merge request gitlab-org/gitlab-ce!17720
\| *	Merge branch ↵	Filipa Lacerda	2018-03-19	1	-7/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'43928-merge-request-comment-gets-cleared-once-the-previous-comment-is-submitted' into 'master' Resolve "Notes karma specs failing" Closes #44002 See merge request gitlab-org/gitlab-ce!17627
\| *	Merge remote-tracking branch 'dev/10-6-stable' into 10-6-stable-prepare-rc7	James Lopez	2018-03-19	57	-252/+557
\| \|\ \| \|/ \|/\|
* \|	Update VERSION to 10.6.0-rc6v10.6.0-rc6	Robert Speicher	2018-03-18	1	-1/+1
\| \|
* \|	Merge branch '10-6-stable-rc6-critical' into '10-6-stable'	Robert Speicher	2018-03-16	59	-300/+666
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Preparation MR for 10.6RC6 See merge request gitlab/gitlabhq!2358
\| * \|	Merge branch 'fix/auth0-unsafe-login-10-6' into 'security-10-6'	James Lopez	2018-03-16	9	-55/+134
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[10.6] Fix GitLab Auth0 integration signs in the wrong user See merge request gitlab/gitlabhq!2354
\| * \|	Merge branch 'fj-15329-services-callbacks-ssrf' into 'security-10-6'	Douwe Maan	2018-03-16	39	-79/+408
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Server Side Request Forgery in Services and Web Hooks See merge request gitlab/gitlabhq!2337
\| * \|	Merge branch 'ab-44205-user_interacted_projects-migration' into 'master'	Yorick Peterse	2018-03-16	3	-49/+110
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix concurrency issue with migration for user_interacted_projects table. Closes #44205 See merge request gitlab-org/gitlab-ce!17728
\| * \|	Revert "Merge branch '35475-lazy-diff' into 'master'"	James Lopez	2018-03-16	8	-117/+14
\|/ / \| \| \| \| \| \|	This reverts commit e4fded68248c0989b4c31921f1c9f8103c65aef7.
\| *	Merge branch 'dm-mirror-hard-failed-invites' into 'master'10-6-stable-prepare-rc6	Robert Speicher	2018-03-16	2	-3/+3
\| \| \| \| \| \| \| \| \| \|	Prevent sending an access request from failing when the project has invited masters/owners See merge request gitlab-org/gitlab-ce!17760
\| *	Merge branch 'ci-lint-dispatcher-fix' into 'master'	Filipa Lacerda	2018-03-16	2	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change path of CI lints create index.js file Closes #44181 See merge request gitlab-org/gitlab-ce!17751
\| *	Merge branch 'ab-44205-user_interacted_projects-migration' into 'master'	Yorick Peterse	2018-03-16	3	-49/+110
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix concurrency issue with migration for user_interacted_projects table. Closes #44205 See merge request gitlab-org/gitlab-ce!17728
\| *	Merge branch 'osw-43951-single-batch-blob-request-to-gitaly' into 'master'	Sean McGivern	2018-03-16	2	-8/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Submit a single batch blob RPC to Gitaly per HTTP request when viewing diffs Closes #43951 See merge request gitlab-org/gitlab-ce!17659
\| *	Merge branch 'mk/fix-move-upload-files-on-group-transfer' into 'master'	Robert Speicher	2018-03-16	5	-46/+142
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix moving local, unhashed upload or pages directories during group transfer Closes #43993 See merge request gitlab-org/gitlab-ce!17658
\| *	Merge branch 'cache-refactor' into 'master'	Sean McGivern	2018-03-16	12	-216/+313
\|/ \| \| \| \| \| \|	Cache `#can_be_resolved_in_ui?` git operations Closes gitaly#1051 See merge request gitlab-org/gitlab-ce!17589
*	Update VERSION to 10.6.0-rc5v10.6.0-rc5	Robert Speicher	2018-03-14	1	-1/+1
\|