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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Exports all the methods in the same place37220-es-modules	Filipa Lacerda	2017-09-18	1	-25/+28
\|
*	Merge branch 'master' into 37220-es-modules	Mike Greiling	2017-09-18	357	-4475/+7015
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (148 commits) Remove gaps under nav on build page Replace the 'project/snippets.feature' spinach test with an rspec analog Use correct group members path for members flyout link Replace the 'project/commits/revert.feature' spinach test with an rspec analog Merge branch 'rs-incoming-email-domain-docs' into 'security-10-0' Replace the 'project/archived.feature' spinach test with an rspec analog Fix broken link in docs/api/wiki.md Fixed the new sidebars width when browser has scrollbars Improve 'spec/features/profiles/*' specs Replace the 'search.feature' spinach test with an rspec analog dedupe yarn packages add dependency approvals (all MIT license) update build image to latest with node 8.x, yarn 1.0.2, and chrome 61 Ensure we use `Entities::User` for non-admin `users/:id` API requests Minor update to address Sean McGivern's comment. Add data migration Fix setting share_with_group_lock created services for keys Prepare Repository#merge for migration to Gitaly Never connect to webpack-dev-server over SSL ...
\| *	Merge branch 'update-user_uses_slash_commands_spec' into 'master'	Rémy Coutable	2017-09-18	1	-4/+4
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Minor update to address Sean McGivern's comment. See merge request gitlab-org/gitlab-ce!14311
\| \| *	Minor update to address Sean McGivern's comment.	manolis	2017-09-15	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \|	More details are available here https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13436/diffs#note_39115837
\| * \|	Merge branch 'replace_project_snippets.feature' into 'master'	Rémy Coutable	2017-09-18	7	-135/+95
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace the 'project/snippets.feature' spinach test with an rspec analog See merge request gitlab-org/gitlab-ce!14326
\| \| * \|	Replace the 'project/snippets.feature' spinach test with an rspec analog	Vitaliy @blackst0ne Klachkov	2017-09-18	7	-135/+95
\| \| \| \|
\| * \| \|	Merge branch '37957-fix-groups-members-flyout-link' into 'master'	Phil Hughes	2017-09-18	1	-1/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use correct group members path for members flyout link Closes #37957 See merge request gitlab-org/gitlab-ce!14329
\| \| * \| \|	Use correct group members path for members flyout link37957-fix-groups-members-flyout-link	kushalpandya	2017-09-18	1	-1/+1
\| \| \|/ /
\| * \| \|	Merge branch 'fix_wiki_md' into 'master'	Achilleas Pipinellis	2017-09-18	1	-0/+2
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken link in docs/api/wiki.md See merge request gitlab-org/gitlab-ce!14296
\| \| * \| \|	Fix broken link in docs/api/wiki.md	Vitaliy @blackst0ne Klachkov	2017-09-17	1	-0/+2
\| \| \| \| \|
\| * \| \| \|	Merge branch 'operation-service-merge' into 'master'	Rémy Coutable	2017-09-18	8	-78/+76
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prepare Repository#merge for migration to Gitaly Closes gitaly#559 See merge request gitlab-org/gitlab-ce!14154
\| \| * \| \| \|	Prepare Repository#merge for migration to Gitalyoperation-service-merge	Jacob Vosmaer	2017-09-15	8	-78/+76
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'fix-dev-ssl' into 'master'	Grzegorz Bizon	2017-09-18	1	-1/+1
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Never connect to webpack-dev-server over SSL in dev mode See merge request gitlab-org/gitlab-ce!14297
\| \| * \| \| \| \|	Never connect to webpack-dev-server over SSLfix-dev-ssl	Alessio Caiazza	2017-09-15	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch '24121_extract_yet_another_users_finder' into 'master'	Grzegorz Bizon	2017-09-18	4	-40/+169
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extract AutocompleteController#users into finder Closes #24121 See merge request gitlab-org/gitlab-ce!13778
\| \| * \| \| \| \| \|	add Mayra Cabrera to authors of change	Maxim Rydkin	2017-09-10	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	move `find_users` method into finder and add `load_group` method	Maxim Rydkin	2017-09-10	3	-28/+58
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	rename yet_another_users_finder into autocomplete_users_finder	Maxim Rydkin	2017-09-10	3	-3/+3
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	fix rubocop	Maxim Rydkin	2017-09-10	1	-8/+7
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	adds changelog	Maxim Rydkin	2017-09-10	1	-0/+5
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	finish spec/finders/yet_another_users_finder_spec.rb	Maxim Rydkin	2017-09-10	1	-54/+42
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	extract finder and add first test	Maxim Rydkin	2017-09-10	3	-22/+129
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'replace_project_commits_revert.feature' into 'master'	Rémy Coutable	2017-09-18	4	-73/+61
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace the 'project/commits/revert.feature' spinach test with an rspec analog See merge request gitlab-org/gitlab-ce!14325
\| \| * \| \| \| \| \| \|	Replace the 'project/commits/revert.feature' spinach test with an rspec analog	Vitaliy @blackst0ne Klachkov	2017-09-18	4	-73/+61
\| \| \| \|_\|_\|_\|/ / \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'replace_project_archived.feature' into 'master'	Rémy Coutable	2017-09-18	4	-66/+48
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace the 'project/archived.feature' spinach test with an rspec analog See merge request gitlab-org/gitlab-ce!14322
\| \| * \| \| \| \| \| \|	Replace the 'project/archived.feature' spinach test with an rspec analog	Vitaliy @blackst0ne Klachkov	2017-09-17	4	-66/+48
\| \| \| \|_\|_\|_\|/ / \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'update-test-images' into 'master'	Tim Zallmann	2017-09-18	3	-38/+164
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update build images See merge request gitlab-org/gitlab-ce!14315
\| \| * \| \| \| \| \| \|	dedupe yarn packagesupdate-test-images	Mike Greiling	2017-09-16	1	-36/+126
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	add dependency approvals (all MIT license)	Mike Greiling	2017-09-16	1	-0/+36
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	update build image to latest with node 8.x, yarn 1.0.2, and chrome 61	Mike Greiling	2017-09-16	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'improve_spec_features_profiles_specs' into 'master'	Rémy Coutable	2017-09-18	8	-38/+39
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve 'spec/features/profiles/*' specs Closes #37855 et #37856 See merge request gitlab-org/gitlab-ce!14317
\| \| * \| \| \| \| \| \| \|	Improve 'spec/features/profiles/*' specs	Vitaliy @blackst0ne Klachkov	2017-09-16	8	-38/+39
\| \| \| \|_\|_\|_\|/ / / \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'replace_search.feature' into 'master'	Rémy Coutable	2017-09-18	15	-526/+564
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace the 'search.feature' spinach test with an rspec analog See merge request gitlab-org/gitlab-ce!14248
\| \| * \| \| \| \| \| \| \|	Replace the 'search.feature' spinach test with an rspec analog	Vitaliy @blackst0ne Klachkov	2017-09-16	15	-526/+564
\| \| \|/ / / / / / /
\| * \| \| \| \| \| \| \|	Merge branch 'mk-delete-conflicting-redirects-mysql' into 'master'	Douwe Maan	2017-09-18	6	-0/+386
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean up redirect routes that conflict with regular routes Closes #36229 See merge request gitlab-org/gitlab-ce!13783
\| \| * \| \| \| \| \| \| \|	Reduce batch sizemk-delete-conflicting-redirects-mysql	Michael Kozono	2017-09-14	2	-5/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	…to stay within our query timeout of 60s. Also reduce the job interval to keep the same overall migration time of ~3.3 days.
\| \| * \| \| \| \| \| \| \|	Spread out the work a little	Michael Kozono	2017-09-14	4	-10/+117
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Extract helper for queuing background jobs	Michael Kozono	2017-09-14	4	-34/+113
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Simplify query	Michael Kozono	2017-09-14	1	-15/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Performance does not need to be optimized in this case because this will be run in batches at a controlled rate.
\| \| * \| \| \| \| \| \| \|	Add specs for deleting conflicting redirects	Michael Kozono	2017-09-14	4	-3/+94
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Delete conflicting redirects in background	Michael Kozono	2017-09-14	2	-0/+118
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'role-badge-fix' into 'master'	Douwe Maan	2017-09-18	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	IssueNotes: Fix role badge styling. See merge request gitlab-org/gitlab-ce!14279
\| \| * \| \| \| \| \| \| \| \|	IssueNotes: Fix role badge styling.role-badge-fix	Fatih Acet	2017-09-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch '37857-build-header-gap' into 'master'	Phil Hughes	2017-09-18	2	-7/+7
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove gaps under nav on build page Closes #37857 See merge request gitlab-org/gitlab-ce!14283
\| \| * \| \| \| \| \| \| \| \| \|	Remove gaps under nav on build page	Annabel Dunstone Gray	2017-09-18	2	-7/+7
\| \|/ / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'docs-replace-pipelines-cicd' into 'master'	Achilleas Pipinellis	2017-09-18	6	-17/+17
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change Pipelines to CI/CD for Settings page See merge request gitlab-org/gitlab-ce!14168
\| \| * \| \| \| \| \| \| \| \|	Merge branch 'master' into 'docs-replace-pipelines-cicd'	Achilleas Pipinellis	2017-09-18	384	-4667/+7147
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # doc/ci/variables/README.md
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'rs-incoming-email-domain-docs' into 'security-10-0'	Robert Speicher	2017-09-17	1	-2/+29
\| \| \|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Security Concerns section to reply by email documentation [ci skip] See merge request gitlab/gitlabhq!2191
\| * \| \| \| \| \| \| \| \|	Merge branch 'fix-sidebar-with-scrollbars' into 'master'	Annabel Dunstone Gray	2017-09-16	4	-9/+23
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed the new sidebars width when browser has scrollbars Closes #37606 See merge request gitlab-org/gitlab-ce!14191
\| \| * \| \| \| \| \| \| \| \|	Fixed the new sidebars width when browser has scrollbars	Phil Hughes	2017-09-16	4	-9/+23
\| \|/ / / / / / / / /