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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix markdown parsing for doc pagedocs/fix-doc-block	Steve Azzopardi	2019-06-03	1	-3/+3
\| \| \| \| \|	The lack of indentatioin is causing the markdown parser to get confused and formating it wrong.
*	Merge branch 'ac-graphql-stats' into 'master'	Dmitriy Zaporozhets	2019-06-03	20	-5/+362
\|\ \| \| \| \| \| \| \| \|	Add Namespace and ProjectStatistics to GraphQL API See merge request gitlab-org/gitlab-ce!28277
\| *	Add Namespace and ProjectStatistics to GraphQL API	Alessio Caiazza	2019-06-03	20	-5/+362
\| \| \| \| \| \| \| \| \| \| \| \|	We can query namespaces, and nested projects. Projects now exposes statistics
* \|	Merge branch 'issue/51022' into 'master'	Annabel Dunstone Gray	2019-06-03	4	-3/+8
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	added `dropdown-extended-height` class to labels dropdown-menu See merge request gitlab-org/gitlab-ce!28659
\| * \|	Add `dropdown-extended-height` class to labels dropdown	Michel Engelen	2019-06-03	4	-3/+8
\|/ /
* \|	Merge branch 'abstract-auto-merge' into 'master'	Kamil Trzciński	2019-06-03	37	-187/+490
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Refactor and abstract Auto Merge Processes See merge request gitlab-org/gitlab-ce!28595
\| * \|	Fix frontend tests related to autoMergeStrategyabstract-auto-merge	Nathan Friend	2019-06-03	7	-23/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A few minor frontend changes to complete the refactoring from MWPS to the more generic autoMergeStrategy.
\| * \|	Abstract auto merge processes	Shinya Maeda	2019-06-03	35	-175/+478
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We have one auto merge strategy today - Merge When Pipeline Succeeds. In order to add more strategies for Merge Train feature, we abstract the architecture to be more extensible. Removed arguments Fix spec
* \| \|	Merge branch '11759-api-dependencies-list-mvc' into 'master'	Sean McGivern	2019-06-03	1	-0/+422
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add dependency_list report fixture See merge request gitlab-org/gitlab-ce!29025
\| * \| \|	Add dependency_list report fixture	Tetiana Chupryna	2019-06-03	1	-0/+422
\|/ / /
* \| \|	Merge branch 'ce-fj-11886-fix-port-validation' into 'master'	Kamil Trzciński	2019-06-03	3	-1/+14
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix port validations in .gitlab-webide.yml See merge request gitlab-org/gitlab-ce!29016
\| * \| \|	Fix port validations in .gitlab-webide.ymlce-fj-11886-fix-port-validation	Francisco Javier López	2019-06-01	3	-1/+14
\| \| \| \|
* \| \| \|	Merge branch 'qa-review-knapsack' into 'master'	Rémy Coutable	2019-06-03	8	-1/+100
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE] Run review-qa-all in parallel See merge request gitlab-org/gitlab-ce!28283
\| * \| \| \|	Generate knapsack report for review-qa-all	Mark Lapierre	2019-06-03	8	-1/+100
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add knapsack qa report and use it to run tests in parallel Use the RSpec runner with knapsack The way the Knapsack runner uses exec to start rspec seems incompatible with the way we expect it to work. Plus, it requires specifying KNAPSACK_TEST_DIR. Instead, we use knapsacks AllocatorBuilder to select the spec files to run, and then start rspec as normal, via RSpec::Core::Runner.run This also means we can incorporate tags. Let the job run automatically Include KNAPSACK_TEST_FILE_PATTERN in vars Check all defined knapsack env vars before requiring knapsack
* \| \| \|	Merge branch 'sh-fix-issue-58714' into 'master'	Yorick Peterse	2019-06-03	3	-1/+7
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix migration failure when groups are missing route Closes #58714 See merge request gitlab-org/gitlab-ce!29022
\| * \| \|	Fix migration failure when groups are missing routesh-fix-issue-58714	Stan Hu	2019-06-01	3	-1/+7
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a Group is missing a route, the migration failed previously with a `Invalid single-table inheritance type` error. To fix this, we can disable STI for the migration class because we don't need to know about the type to do this migration. Besides, currently Group is the only type used in the type column. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58714
* \| \|	Merge branch 'fix-search-dropdown-blur-close' into 'master'	Filipa Lacerda	2019-06-03	4	-2/+21
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix search dropdown not closing on blur if empty Closes #53741 See merge request gitlab-org/gitlab-ce!28730
\| * \| \|	Fix search dropdown not closing on blur if emptyfix-search-dropdown-blur-close	Luke Bennett	2019-05-31	4	-2/+21
\| \| \| \|
* \| \| \|	Merge branch '59854-fix-forms-stylint-issues' into 'master'	Filipa Lacerda	2019-06-03	3	-106/+61
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix style-lint errors and warnings for `app/assets/stylesheets/framework/forms.scss` Closes #59854 See merge request gitlab-org/gitlab-ce!28129
\| * \| \| \|	Remove responsive column classes for sm screens59854-fix-forms-stylint-issues	Enrique Alcantara	2019-05-30	2	-38/+38
\| \| \| \| \|
\| * \| \| \|	Remove unnecessary btn styling	Enrique Alcantara	2019-05-30	1	-7/+0
\| \| \| \| \|
\| * \| \| \|	Remove unnecessary text-block styling	Enrique Alcantara	2019-05-30	3	-44/+27
\| \| \| \| \|
\| * \| \| \|	Use single position: relative declaration	Enrique Alcantara	2019-05-30	1	-21/+18
\| \| \| \| \|
\| * \| \| \|	Remove unused form-control-label selector	Enrique Alcantara	2019-05-30	1	-22/+4
\| \| \| \| \|
* \| \| \| \|	Merge branch '10795-add-epic-tree-BE-epic-graphql-support' into 'master'	Nick Thomas	2019-06-03	10	-6/+62
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport to add fields to IssueType See merge request gitlab-org/gitlab-ce!28998
\| * \| \| \| \|	Added common fields to the IssueType10795-add-epic-tree-BE-epic-graphql-support	Brett Walker	2019-05-31	10	-6/+62
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and allow passing of child_complexity to the 'resolver_complexity' metho
* \| \| \| \| \|	Merge branch 'zj-remove-delta-island-feature-flag' into 'master'	Bob Van Landuyt	2019-06-03	2	-1/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove delta island feature flag Closes gitaly#1575 See merge request gitlab-org/gitlab-ce!28871
\| * \| \| \| \| \|	Remove delta island feature flag	Zeger-Jan van de Weg	2019-06-03	2	-1/+4
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Delta islands were implemented last released in: https://gitlab.com/gitlab-org/gitaly/merge_requests/1110. It's been enabled on production and works as expected.
* \| \| \| \| \|	Merge branch ↵	Phil Hughes	2019-06-03	1	-1/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'11041-move-ee-differences-for-app-views-search-_results-html-haml' into 'master' CE: Resolve EE differences in search/_results.html.haml See merge request gitlab-org/gitlab-ce!28952
\| * \| \| \| \| \|	CE: Resolve EE differences in search/_results.html.haml11041-move-ee-differences-for-app-views-search-_results-html-haml	Donald Cook	2019-05-31	1	-1/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '62429-remove-unused-avatar-sizes' into 'master'	Phil Hughes	2019-06-03	5	-38/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused avatar sizes Closes #62429 See merge request gitlab-org/gitlab-ce!28947
\| * \| \| \| \| \| \|	Remove unused avatar sizes62429-remove-unused-avatar-sizes	Annabel Dunstone Gray	2019-05-31	5	-38/+6
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Update avatars to use only sizes from the 8px grid
* \| \| \| \| \| \|	Merge branch 'remove-mr-diff-header-height' into 'master'	Phil Hughes	2019-06-03	3	-2/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove fixed height from MR diff headers Closes #62596 See merge request gitlab-org/gitlab-ce!28946
\| * \| \| \| \| \| \|	Remove fixed height from MR diff headersremove-mr-diff-header-height	Annabel Dunstone Gray	2019-05-31	3	-2/+6
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'gitlab-ui-259-style-checkboxes' into 'master'	Kushal Pandya	2019-06-03	1	-0/+14
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Style gitlab-ui checkboxes See merge request gitlab-org/gitlab-ce!28622
\| * \| \| \| \| \| \| \|	Style gitlab-ui checkboxes	Sam Bigelow	2019-05-30	1	-0/+14
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'patch-48' into 'master'	Ray Paik	2019-06-03	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Fix typos See merge request gitlab-org/gitlab-ce!29020
\| * \| \| \| \| \| \| \| \|	Fix typo	Philipp C. H	2019-06-01	1	-2/+2
\| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'patch-65' into 'master'	Ray Paik	2019-06-03	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in multiple_assignees_for_issues.md See merge request gitlab-org/gitlab-ce!29002
\| * \| \| \| \| \| \| \|	Update multiple_assignees_for_issues.md	Ilya Peterov	2019-05-31	1	-1/+1
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'sh-bump-ruby-concurrency-gem' into 'master'	Ash McKenzie	2019-06-03	1	-3/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump concurrent-ruby and concurrent-ruby-ext to 1.1.5 See merge request gitlab-org/gitlab-ce!29015
\| * \| \| \| \| \| \| \|	Bump concurrent-ruby and concurrent-ruby-ext to 1.1.5sh-bump-ruby-concurrency-gem	Stan Hu	2019-06-01	1	-3/+3
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This matches the version used in Gitaly and avoids potential version conflicts when multiple versions are installed.
* \| \| \| \| \| \| \|	Merge branch 'docs/admin_area_runners' into 'master'	Evan Read	2019-06-03	2	-2/+53
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document the Admin Area's Runners page See merge request gitlab-org/gitlab-ce!28852
\| * \| \| \| \| \| \| \|	Document the Admin Area's Runners page	Russell Dickenson	2019-06-03	2	-2/+53
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch '60782-docs-redis-troubleshooting-replication' into 'master'	Evan Read	2019-06-03	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs feedback: Redis Troubleshooting Replication Closes #60782 See merge request gitlab-org/gitlab-ce!28936
\| * \| \| \| \| \| \|	Fix troubleshooting command to include host and quote password60782-docs-redis-troubleshooting-replication	Gabriel Mazetto	2019-05-30	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '61821-tooltip-consistency' into 'master'	Mike Greiling	2019-06-01	3	-11/+17
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Tooltip Consistency" Closes #61821 See merge request gitlab-org/gitlab-ce!28839
\| * \| \| \| \| \| \| \|	Make tooltips consistently render on top	Justin Boyson	2019-06-01	3	-11/+17
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	On edit-button simply set position to top. Made this change directly in template since edit-button is only used in one place. Had to wrap the comments toggle button in span tag to make tooltip show even when disabled as per bootstrap-vue docs. https://bootstrap-vue.js.org/docs/components/tooltip#overview Note: Also changexc button to gl-buttonto be consistent with rest of file.
* \| \| \| \| \| \| \|	Merge branch 'revert-2d980fad' into 'master'	Mike Greiling	2019-05-31	3	-8/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'js-i18n-board-store' into 'master'" See merge request gitlab-org/gitlab-ce!28977
\| * \| \| \| \| \| \| \|	Revert "Merge branch 'js-i18n-board-store' into 'master'"revert-2d980fad	Brandon Labuschagne	2019-05-31	3	-8/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !28712