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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update VERSION to 10.5.4v10.5.4	Ian Baum	2018-03-08	1	-1/+1
\|
*	Update CHANGELOG.md for 10.5.4	Ian Baum	2018-03-08	13	-61/+21
\| \| \|	[ci skip]
*	Merge branch '10-5-stable-patch-4' into '10-5-stable'	Ian Baum	2018-03-08	55	-397/+845
\|\ \| \| \| \| \| \| \| \|	Prepare 10.5.4 release See merge request gitlab-org/gitlab-ce!17584
\| *	Fix rubocop error with features/steps/project/pages.rb10-5-stable-patch-4	Ian Baum	2018-03-07	1	-1/+1
\| \|
\| *	Fix pages spinach failure	Kamil Trzciński	2018-03-07	1	-1/+1
\| \|
\| *	Merge branch '42877-for-10-5-stable-patch-4' into '10-5-stable-patch-4'	Ian Baum	2018-03-07	1	-3/+0
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix snippets problem in 10-5-stable-patch-4 See merge request gitlab-org/gitlab-ce!17610
\| \| *	Fix snippets problem in 10-5-stable-patch-4	Andreas Brandl	2018-03-07	1	-3/+0
\| \|/
\| *	Merge branch 'fix/sm/fix_pages_worker' into 'master'	Kamil Trzciński	2018-03-07	4	-14/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reload stable object to prevent erase artifacts with old state (Ver 2) Closes #43641 See merge request gitlab-org/gitlab-ce!17522
\| *	Revert "Merge branch 'fix/sm/fix_pages_worker' into 'master'"	Ian Baum	2018-03-07	5	-94/+14
\| \| \| \| \| \| \| \|	This reverts commit 6846dad292bd7693859012a5b27158d1a995ddae.
\| *	Merge branch 'backport-ee-5049-to-ce' into 'master'	Douwe Maan	2018-03-07	1	-2/+15
\| \| \| \| \| \| \| \| \| \|	Ports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4747 to CE See merge request gitlab-org/gitlab-ce!17520
\| *	Merge branch 'fix/sm/fix_pages_worker' into 'master'	Kamil Trzciński	2018-03-06	5	-14/+94
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reload stable object to prevent erase artifacts with old state (Ver 2) Closes #43641 See merge request gitlab-org/gitlab-ce!17522
\| *	Merge branch '42877-fix-visibility-change-performance' into 'master'	Yorick Peterse	2018-03-06	5	-40/+77
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert Project.public_or_visible_to_user changes but apply change to SnippetsFinder Closes #42877 See merge request gitlab-org/gitlab-ce!17476
\| *	Merge branch 'remove-projects-finder-from-todos-finder' into 'master'	Sean McGivern	2018-03-06	2	-9/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't use ProjectsFinder in TodosFinder Closes #43767 See merge request gitlab-org/gitlab-ce!17462
\| *	Merge branch 'an/lograge-fix' into 'master'	Stan Hu	2018-03-06	1	-1/+6
\| \| \| \| \| \| \| \| \| \|	Fix for open-ended parameter's in lograge causing elastic memory issues See merge request gitlab-org/gitlab-ce!17419
\| *	Merge branch ↵	Nick Thomas	2018-03-06	3	-1/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'43531-500-error-searching-wiki-incompatible-character-encodings-utf-8-and-ascii-8bit' into 'master' Resolve "500 Error searching wiki: incompatible character encodings: UTF-8 and ASCII-8BIT" Closes #43531 See merge request gitlab-org/gitlab-ce!17413
\| *	Merge branch '43532-error-on-admin-applications-prometheus-template' into ↵	Stan Hu	2018-03-06	5	-26/+77
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Error 500 on route "/admin/application_settings/services/1882/edit" -> edit Prometheus Service Template" Closes #43532 See merge request gitlab-org/gitlab-ce!17377
\| *	Merge branch '43261-fix-prometheus-installation' into 'master'	Kamil Trzciński	2018-03-06	2	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable RBAC on Prometheus values.yml Closes #43621 See merge request gitlab-org/gitlab-ce!17372
\| *	Merge branch 'issue-edit-shortcut' into 'master'	Filipa Lacerda	2018-03-06	3	-4/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed issue edit shortcut not working Closes #43560 See merge request gitlab-org/gitlab-ce!17360
\| *	Merge branch 'mk/fix-error-code-for-repo-does-not-exist' into 'master'	Douwe Maan	2018-03-06	5	-5/+23
\| \| \| \| \| \| \| \| \| \|	Respond with more appropriate HTTP status code when repo does not exist See merge request gitlab-org/gitlab-ce!17341
\| *	Merge branch 'minimal-fix-for-artifacts-service' into 'master'	Grzegorz Bizon	2018-03-06	3	-18/+63
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Minimal fix for artifacts service Closes #43022 See merge request gitlab-org/gitlab-ce!17313
\| *	Merge branch '43510-merge-requests-and-issues-don-t-show-for-all-subgroups' ↵	Grzegorz Bizon	2018-03-06	8	-59/+108
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Merge requests and issues don't show for all subgroups" Closes #43510 See merge request gitlab-org/gitlab-ce!17312
\| *	Merge branch 'grpc-unavailable-restart' into 'master'	Douwe Maan	2018-03-06	7	-131/+250
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Restart Unicorn and Sidekiq when GRPC throws 14:Endpoint read failed Closes gitaly#1036 See merge request gitlab-org/gitlab-ce!17293
\| *	Merge branch 'zj-gitaly-encoding-issue' into 'master'	Robert Speicher	2018-03-06	3	-52/+73
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Encode revision for gitattributes ref Closes gitaly#1032 and #43278 See merge request gitlab-org/gitlab-ce!17291
\| *	Merge branch '43299-revert-bad-merge' into 'master'	Phil Hughes	2018-03-06	2	-33/+36
\|/ \| \| \| \| \| \|	Resolve "Group Leave action is broken on Groups Dashboard and Homepage" Closes #43299 See merge request gitlab-org/gitlab-ce!17183
*	Merge branch '10-5-stable' of gitlab.com:gitlab-org/gitlab-ce into ↵	James Lopez	2018-03-06	1	-1/+1
\|\ \| \| \| \| \| \|	dev-10-5-stable
\| *	Merge branch 'fix-tags-10-5' into '10-5-stable'	Robert Speicher	2018-03-05	1	-1/+1
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix error loading javascript in edit tags form See merge request gitlab-org/gitlab-ce!17490
\| \| *	Fix error loading javascript in edit tags formfix-tags-10-5	Clement Ho	2018-03-02	1	-1/+1
\| \|/
* \|	Update VERSION to 10.5.3v10.5.3	Robert Speicher	2018-03-01	1	-1/+1
\| \|
* \|	Update CHANGELOG.md for 10.5.3	Robert Speicher	2018-03-01	2	-5/+7
\| \| \| \| \| \|	[ci skip]
* \|	Merge branch '10-5-stable-patch-3' into '10-5-stable'	Robert Speicher	2018-03-01	4	-1/+19
\|\ \ \| \|/ \|/\| \| \| \| \|	Prepare 10.5.3 See merge request gitlab/gitlabhq!2342
\| *	Merge branch 'pages-6-1-gitlab-10-5' into 'security-10-5'	Marin Jankovski	2018-02-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	Update gitlab-pages version (GitLab 10.5) See merge request gitlab/gitlabhq!2330
\| *	Merge branch 'sh-fix-otp-backup-invalidation-10-5' into 'security-10-5'	Douwe Maan	2018-02-27	3	-0/+18
\|/ \| \| \| \|	Ensure that OTP backup codes are always invalidated - 10.5 port See merge request gitlab/gitlabhq!2324
*	Update VERSION to 10.5.2v10.5.2	Ian Baum	2018-02-25	1	-1/+1
\|
*	Update CHANGELOG.md for 10.5.2	Ian Baum	2018-02-25	13	-60/+21
\| \| \|	[ci skip]
*	Merge branch '10-5-stable-patch-2' into '10-5-stable'	Stan Hu	2018-02-23	86	-368/+648
\|\ \| \| \| \| \| \| \| \|	Prepare 10.5.2 release See merge request gitlab-org/gitlab-ce!17322
\| *	Convert Gitaly commit parent IDs to array as early as possible	Sean McGivern	2018-02-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	The tracking issue if this causes problems is https://gitlab.com/gitlab-org/gitaly/issues/1028
\| *	Merge branch 'zj-unit-test-gitaly-arrays' into 'master'	Sean McGivern	2018-02-23	2	-0/+5
\| \| \| \| \| \| \| \| \| \|	Add unit tests for Gitaly types See merge request gitlab-org/gitlab-ce!17237
\| *	Revert "Merge branch 'zj-unit-test-gitaly-arrays' into 'master'"	Ian Baum	2018-02-23	2	-5/+0
\| \| \| \| \| \| \| \|	This reverts commit 3a91c166743f914a2db7a4d8c5bc7af637d3aff4.
\| *	Merge branch 'fix-diff-flash' into 'master'	Clement Ho	2018-02-23	1	-1/+3
\| \| \| \| \| \| \| \| \| \|	only show error if there is an error See merge request gitlab-org/gitlab-ce!17228
\| *	Merge branch '41619-turn-on-legacy-authorization-for-new-clusters-on-gke' ↵	Kamil Trzciński	2018-02-23	4	-3/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Enable "Legacy Authorization" by default when creating a Cluster on GCP Closes #41619 See merge request gitlab-org/gitlab-ce!17302
\| *	Merge branch 'git-access-existence-check' into 'master'	Robert Speicher	2018-02-23	5	-7/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix repo existence check in GitAccessWiki Closes #43385 and gitlab-com/infrastructure#3734 See merge request gitlab-org/gitlab-ce!17268
\| *	Merge branch 'fix-500-for-invalid-upload-path' into 'master'	Sean McGivern	2018-02-23	6	-1/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix 500 error when loading an invalid upload URL Closes gitlab-ee#4998 See merge request gitlab-org/gitlab-ce!17267
\| *	Merge branch '43373-fix-cache-index-appending' into 'master'	Kamil Trzciński	2018-02-23	3	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "cache key for CI stopped working" Closes #43373 See merge request gitlab-org/gitlab-ce!17260
\| *	Merge branch 'minor-improvement-to-k8s-monitoring-docs' into 'master'	Marcia Ramos	2018-02-23	1	-2/+2
\| \| \| \| \| \| \| \| \| \|	Improve link for CI environment variable, wording. See merge request gitlab-org/gitlab-ce!17252
\| *	Merge branch 'update-browser-perf-testing-example-doc' into 'master'	Marcia Ramos	2018-02-23	1	-4/+14
\| \| \| \| \| \| \| \| \| \|	Update Browser Performance Testing Example See merge request gitlab-org/gitlab-ce!17249
\| *	Merge branch 'docs-milestones-refactor' into 'master'	Marcia Ramos	2018-02-23	8	-40/+88
\| \| \| \| \| \| \| \| \| \|	Docs milestones refactor See merge request gitlab-org/gitlab-ce!17247
\| *	Merge branch 'zj-unit-test-gitaly-arrays' into 'master'	Sean McGivern	2018-02-23	2	-0/+5
\| \| \| \| \| \| \| \| \| \|	Add unit tests for Gitaly types See merge request gitlab-org/gitlab-ce!17237
\| *	Merge branch '43424-put_all_event_metrics_behind_feature_flags' into 'master'	Douwe Maan	2018-02-23	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix for sidekiq metrics set cardinality growing unbounded Closes #43424 See merge request gitlab-org/gitlab-ce!17235
\| *	Merge branch 'docs/lfs-lock' into 'master'	Marcia Ramos	2018-02-23	1	-1/+3
\| \| \| \| \| \| \| \| \| \|	Add version which LFS lock was introduced See merge request gitlab-org/gitlab-ce!17233
\| *	Merge branch 'zj-branch-contains-git-message' into 'master'	Douwe Maan	2018-02-23	3	-10/+48
\| \| \| \| \| \| \| \| \| \|	Allow branchnames to be named the same as the commit it points to See merge request gitlab-org/gitlab-ce!17231