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

	Commit message (Collapse)	Author	Age	Files	Lines
*	MRWidget: Use targetBranchPath in everywhere.acet-mr-widget-fix-link	Fatih Acet	2017-05-12	2	-4/+4
\|
*	MRWidget: Fix target branch link.	Fatih Acet	2017-05-12	1	-3/+10
\|
*	Merge branch 'pipeline-schedules-callout-docs-url' into 'master'	Filipa Lacerda	2017-05-11	1	-0/+15
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Set correct docsUrl in pipeline schedules callout component. Closes #31957 See merge request !11216
\| *	Pass docsUrl to pipeline schedules callout component.pipeline-schedules-callout-docs-url	Bryce Johnson	2017-05-11	1	-0/+15
\| \|
* \|	Merge branch 'winh-sidebar-mock-fix' into 'master'	Filipa Lacerda	2017-05-11	3	-0/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing tear down of sidebarMockInterceptor Closes #32020 See merge request !11204
\| * \|	Add missing tear down of sidebarMockInterceptor (!11204)winh-sidebar-mock-fix	winh	2017-05-11	3	-0/+3
\| \|/
* \|	Merge branch 'winh-pipeline-author-link' into 'master'	Filipa Lacerda	2017-05-11	7	-210/+138
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Link to commit author user page from pipelines Closes #29368 See merge request !11100
\| * \|	Add failing test for #29368	winh	2017-05-11	1	-11/+79
\| \| \|
\| * \|	Replace pipeline mock data with JSON fixture	winh	2017-05-10	7	-202/+62
\| \| \|
* \| \|	Merge branch 'zj-clean-up-ci-variables-table' into 'master'	Yorick Peterse	2017-05-11	2	-1/+3
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean up ci variables table Closes #31799 See merge request !11186
\| * \|	Remove rails dependent: :destroy statement	Z.J. van de Weg	2017-05-11	2	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enforced by the database, and no callbacks need to be called. Combined with 7b9b2c6099 and 294a8b8a6d this resolves gitlab-org/gitlab-ce#31799
* \| \|	Merge branch 'dm-fix-mysql-failure' into 'master'	Sean McGivern	2017-05-11	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix MySQL build failure Closes #32106 See merge request !11277
\| * \| \|	Fix MySQL build failuredm-fix-mysql-failure	Douwe Maan	2017-05-10	1	-1/+1
\| \| \| \|
* \| \| \|	Fix slash commands detection in comments	Kushal Pandya	2017-05-11	1	-6/+19
\| \| \| \|
* \| \| \|	Merge branch '32045-vue-warn-cannot-find-element-issuable-time-tracker' into ↵	Phil Hughes	2017-05-11	1	-42/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Remove sidebar bundle spec Closes #32045 See merge request !11223
\| * \| \| \|	Remove sidebar bundle spec32045-vue-warn-cannot-find-element-issuable-time-tracker	Clement Ho	2017-05-10	1	-42/+0
\| \| \| \| \|
* \| \| \| \|	Merge branch 'dm-auxiliary-viewers' into 'master'	Sean McGivern	2017-05-11	9	-66/+337
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement auxiliary blob viewers See merge request !11195
\| * \| \| \|	Reset Repository#license memo when license file is changed	Douwe Maan	2017-05-10	1	-1/+2
\| \| \| \| \|
\| * \| \| \|	Implement auxiliary blob viewers	Douwe Maan	2017-05-10	9	-65/+335
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge branch 'fix-shortcuts_spec-explore-page-transient-failure' into 'master'	Douwe Maan	2017-05-11	1	-14/+17
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	Find the nothing-here-block before asserting page content when on explore page of shortcuts_spec.rb See merge request !11250
\| * \| \|	Fix `send_key` to `send_keys` and add EOF newlinefix-shortcuts_spec-explore-page-transient-failure	Luke "Jared" Bennett	2017-05-10	1	-3/+3
\| \| \| \|
\| * \| \|	Find the nothing-here-block before asserting page content when on explore ↵	Luke "Jared" Bennett	2017-05-10	1	-15/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	page of shortcuts_spec.rb
* \| \| \|	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