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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix MySQL build failuredm-fix-mysql-failure	Douwe Maan	2017-05-10	1	-1/+1
\|
*	Merge branch 'retried-in-database-mysql' into 'master'	Regis Boudinot	2017-05-10	9	-27/+73
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Retried in database Closes #25737 See merge request !11115
\| *	Store retried in database for CI buildsretried-in-database-mysql	Kamil Trzcinski	2017-05-07	9	-27/+73
\| \|
* \|	Track pending requests in AjaxCache	Winnie Hellmann	2017-05-10	1	-14/+43
\| \|
* \|	Merge branch '27144-enforce-rubocop-trailing_commas-no_comma-style' into ↵	Robert Speicher	2017-05-10	62	-97/+97
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Use consistent style for trailing commas" Closes #27144 See merge request !11063
\| * \|	Enable the Style/TrailingCommaInArguments cop	Rémy Coutable	2017-05-10	18	-24/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use the EnforcedStyleForMultiline: no_comma option. Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \|	Enable the Style/TrailingCommaInLiteral cop	Rémy Coutable	2017-05-10	47	-73/+73
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use the EnforcedStyleForMultiline: no_comma option. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Merge branch 'bvl-security-patches' into 'master'	Robert Speicher	2017-05-10	17	-153/+608
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Security patches -> `master` See merge request !11230
\| * \| \|	Use `described_class` in SnippetsFinder-spec	Bob Van Landuyt	2017-05-10	1	-21/+21
\| \| \| \|
\| * \| \|	Merge branch 'tc-fix-private-subgroups-shown' into 'security'	Douwe Maan	2017-05-10	2	-11/+81
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use GroupsFinder to find subgroups the user has access to See merge request !2096
\| * \| \|	Merge branch 'fix-hamlit-xss' into 'security-9-1'	Robert Speicher	2017-05-10	1	-0/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	New Hamlit XSS fix, does not include extraneous changes See merge request !2095
\| * \| \|	Merge branch 'snippets-finder-visibility' into 'security'	Douwe Maan	2017-05-10	8	-95/+320
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor snippets finder & dont return internal snippets for external users See merge request !2094
\| * \| \|	Merge branch '31157-respect-project-features-in-wiki-search' into 'security'	Douwe Maan	2017-05-10	1	-3/+72
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Respect project features in wiki and blob search See merge request !2089
\| * \| \|	Merge branch 'snippets_visibility' into 'security'	Sean McGivern	2017-05-10	2	-3/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix snippets visibility for show action - external users can not see internal snippets See merge request !2087
\| * \| \|	Merge branch 'rs-sanitize-submodule-urls' into 'security'	Douwe Maan	2017-05-10	1	-0/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sanitize submodule URLs before linking to them in the file tree view See merge request !2084
\| * \| \|	Merge branch 'bvl-security-9-1-validate-urls-in-markdown-using-uri'	Robert Speicher	2017-05-10	2	-38/+64
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(security-9-1) Add correct `rel` attributes to external links when rendering markdown See merge request !2097
\| * \| \|	Merge branch 'bvl-security-9-1-markup-pipeline'	Robert Speicher	2017-05-10	2	-4/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(security-9-1) Render asciidoc & other markup using banzai in a pipeline See merge request !2098
* \| \| \|	Merge branch ↵	Phil Hughes	2017-05-10	1	-0/+59
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'31474-issue-boards-sidebar-milestone-dropdown-should-not-be-multi-select' into 'master' Resolve "Issue boards sidebar milestone dropdown should not be multi select" Closes #31474 See merge request !11084
\| * \| \| \|	Disallow multiselect for Milestone dropdown	Sam Rose	2017-05-10	1	-0/+59
\| \| \| \| \|
* \| \| \| \|	Merge branch 'tc-clean-pending-delete-projects' into 'master'	Douwe Maan	2017-05-10	2	-0/+111
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Post-deploy to clean `pending_delete` projects Closes #20984 See merge request !11044
\| * \| \| \| \|	No user needed to cleanup namespaceless pending delete projects	Toon Claes	2017-05-10	2	-11/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since this is a cleanup, ran by a post-deploy, there is no need to lookup the admin to run the cleanup.
\| * \| \| \| \|	Use worker to destroy namespaceless projects in post-deploy	Toon Claes	2017-05-10	3	-72/+105
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Destroying projects can be very time consuming. So instead of destroying them in the post-deploy, just schedule them and make Sidekiq do the hard work. They are scheduled in batches of 5000 records. This way the number of database requests is limited while also the amount data read to memory is limited.
\| * \| \| \| \|	Add post-deploy migrate to cleanup projects in pending delete state	Toon Claes	2017-05-10	1	-0/+72
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There are many projects in `pending_delete` state, this post-deploy migration cleans them up. The script is based on https://gitlab.com/gitlab-org/gitlab-ce/snippets/1648654 and https://gitlab.com/gitlab-org/gitlab-ce/snippets/1611429. The use of these scripts were described in https://gitlab.com/gitlab-com/infrastructure/issues/888.
* \| \| \| \| \|	Merge branch 'dm-async-tree-readme' into 'master'	Douwe Maan	2017-05-10	2	-2/+2
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Load tree readme asynchronously See merge request !11191
\| * \| \| \| \|	Load tree readme asynchronouslydm-async-tree-readme	Douwe Maan	2017-05-10	2	-2/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Replace old isObject for underscore methods	Filipa Lacerda	2017-05-10	6	-6/+0
\| \| \| \| \| \|
* \| \| \| \| \|	Tech debt: Creates vue component for loading icon	Filipa Lacerda	2017-05-10	1	-0/+53
\| \| \| \| \| \|
* \| \| \| \| \|	Resolve "Update gem sidekiq-cron from 0.4.4 to 0.6.0 and rufus-scheduler ↵	Dosuken shinya	2017-05-10	1	-0/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	from 3.1.10 to 3.4.0"
* \| \| \| \| \|	Merge branch 'fix-sidebar_spec-assignee-edit-transient-failure' into 'master'	Sean McGivern	2017-05-10	1	-2/+2
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Find dropdown-menu before asserting active item in sidebar_spec.rb See merge request !11246
\| * \| \| \| \|	Find dropdown-menu before asserting active item in sidebar_spec.rbfix-sidebar_spec-assignee-edit-transient-failure	Luke "Jared" Bennett	2017-05-10	1	-2/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'search-restrict-projects-to-group' into 'master'	Filipa Lacerda	2017-05-10	1	-0/+19
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Filter projects by group on search page Closes #29489 See merge request !11169
\| * \| \| \| \| \|	Filter projects by group on search pagesearch-restrict-projects-to-group	Phil Hughes	2017-05-08	1	-0/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	After selecting a group, the projects dropdown will now filter by group projects instead Closes #29489
* \| \| \| \| \| \|	Merge branch 'fix-search-not-highlighting' into 'master'	Filipa Lacerda	2017-05-10	1	-9/+37
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed search terms not highlight Closes #31997 See merge request !11198
\| * \| \| \| \| \| \|	Fixed search terms not highlight	Phil Hughes	2017-05-10	1	-9/+37
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #31997
* \| \| \| \| \| \|	Merge branch 'issue-boards-sidebar-create-new-label-404-error' into 'master'	Filipa Lacerda	2017-05-10	1	-0/+45
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed create label form not working on issue boards in a sub-group project Closes #31862 See merge request !11182
\| * \| \| \| \| \|	Fixed create label form not working on issue boards in a sub-group projectissue-boards-sidebar-create-new-label-404-error	Phil Hughes	2017-05-08	1	-0/+45
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #31862
* \| \| \| \| \|	Merge branch 'use_relative_path_for_project_avatars' into 'master'	Douwe Maan	2017-05-10	8	-21/+52
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use relative paths for group/project/user avatars Closes #13418 and #19662 See merge request !11001
\| * \| \| \| \|	Use relative paths for group/project/user avatars	blackst0ne	2017-05-10	8	-21/+52
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Fix broken test - load correct data32074-failed-build	Filipa Lacerda	2017-05-10	2	-102/+233
\| \| \| \| \|
* \| \| \| \|	Use vue file for table pagination component	Filipa Lacerda	2017-05-10	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'tc-fix-openid-sign-in-at-again' into 'master'	Robert Speicher	2017-05-10	3	-6/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Spec fix: Add :redis keyword to some specs clear state of trackable attributes Closes #32041 See merge request !11221
\| * \| \| \| \|	Revert "Fix OpenID spec failure that assumed current_sign_in_at would be set"tc-fix-openid-sign-in-at-again	Toon Claes	2017-05-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 73f448e589f46865140412754a9c97df52dc16c7.
\| * \| \| \| \|	Add :redis keyword to some specs clear state of trackable attributes	Toon Claes	2017-05-09	3	-5/+5
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The specs that rely on a correct value of the trackable attributes, should include the `:redis` keyword in the spec to ensure the state is reset between various specs. The trackable attributes being: - sign_in_count : Increased every time a sign in is made (by form, openid, oauth) - current_sign_in_at : A timestamp updated when the user signs in - last_sign_in_at : Holds the timestamp of the previous sign in - current_sign_in_ip : The remote ip updated when the user sign in - last_sign_in_ip : Holds the remote ip of the previous sign in The limiting of writing trackable attributes was introduced in gitlab-org/gitlab-ce!11053.
* \| \| \| \|	Merge branch '31053-pipeline-ux' into 'master'	Fatih Acet	2017-05-09	2	-0/+67
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds left connector class to the rendered graph Closes #31053 See merge request !11179
\| * \ \ \ \	Merge branch 'master' into 31053-pipeline-ux31053-pipeline-ux	Filipa Lacerda	2017-05-09	77	-708/+3994
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: Fallback to default pattern when note does not belong to project Merge request widget redesign Fixed focused test in notes spec Fixed UP arrow key not editing last comment in discussion Fix skipped manual actions issue in pipeline processing Fix notify_only_default_branch check for Slack service
\| * \ \ \ \ \	Merge branch 'master' into 31053-pipeline-ux	Filipa Lacerda	2017-05-08	9	-26/+26
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: Update guides for 9.2. [skip ci] add documentation Standardize jasmine test describe block names that test specific methods
\| * \| \| \| \| \| \|	Adds left connector class to the rendered graph	Filipa Lacerda	2017-05-08	2	-0/+67
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '32021-job-component-test-failure' into 'master'	Fatih Acet	2017-05-09	1	-28/+46
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix test failure in job vue componenFix test failure in job vue componentt Closes #32021 See merge request !11208
\| * \| \| \| \| \| \|	Fix test failure in job vue componenFix test failure in job vue componentt32021-job-component-test-failure	Filipa Lacerda	2017-05-09	1	-28/+46
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'sh-fix-openid-spec-failure' into 'master' bj-blank-state-issues-list-bug	Robert Speicher	2017-05-09	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix OpenID spec failure that assumed current_sign_in_at would be set Closes #32041 See merge request !11219