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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Document CI variable LM_PYTHON_VERSION	Fabien Catteau	2019-06-14	1	-0/+17
\| \| \| \|	Show how one can switch to Python 3.5.
*	Merge branch 'caneldem-master-patch-02411' into 'master'	Achilleas Pipinellis	2019-06-14	1	-8/+8
\|\ \| \| \| \| \| \| \| \|	Add which tools is used by License Management project See merge request gitlab-org/gitlab-ce!29610
\| *	Add which tools is used by License Management project	Can Eldem	2019-06-14	1	-8/+8
\|/
*	Merge branch 'docs/link-to-default-helm-chart' into 'master'	Achilleas Pipinellis	2019-06-14	1	-1/+2
\|\ \| \| \| \| \| \| \| \|	Add link to default Helm chart See merge request gitlab-org/gitlab-ce!29652
\| *	Add link to default Helm chart	Evan Read	2019-06-14	1	-1/+2
\|/
*	Merge branch 'docs/admin-area-doc-structure' into 'master'	Achilleas Pipinellis	2019-06-14	1	-30/+34
\|\ \| \| \| \| \| \| \| \|	Add structure to admin area page See merge request gitlab-org/gitlab-ce!29105
\| *	Add structure to admin area page	Evan Read	2019-06-14	1	-30/+34
\|/ \| \| \|	Also slight edit and spelling correction
*	Merge branch 'renovate/gitlab-eslint-plugin-i18n-1.x' into 'master'	Mike Greiling	2019-06-14	2	-2/+2
\|\ \| \| \| \| \| \| \| \|	Update dependency @gitlab/eslint-plugin-i18n to ^1.1.0 See merge request gitlab-org/gitlab-ce!29630
\| *	Update dependency @gitlab/eslint-plugin-i18n to ^1.1.0renovate/gitlab-eslint-plugin-i18n-1.x	Lukas 'Eipi' Eipert	2019-06-13	2	-2/+2
\| \|
* \|	Merge branch 'docs/cross-link-mr-approve' into 'master'	Achilleas Pipinellis	2019-06-14	1	-1/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Cross link to MR approvals docs See merge request gitlab-org/gitlab-ce!29636
\| * \|	Cross link to MR approvals docs	Evan Read	2019-06-14	1	-1/+4
\|/ /
* \|	Merge branch 'leipert-node-12' into 'master'	Mike Greiling	2019-06-14	5	-9/+9
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Update to node@12 See merge request gitlab-org/gitlab-ce!29659
\| * \|	Update to node@12leipert-node-12	Lukas Eipert	2019-06-14	5	-9/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This updates our build images to use node@12. We are also adding a sentence to the from-source installation that while we require a minimum version of node@8, we also recommend node@12. Last but not least, we change the version of node in the .nvmrc so that developers using nvm can automatically use node@12 with the project
* \| \|	Merge branch 'add-mikelewis-as-doc-codeowner' into 'master'	Stan Hu	2019-06-14	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update CODEOWNERS to add mikelewis for doc path See merge request gitlab-org/gitlab-ce!29565
\| * \| \|	Update CODEOWNERS to add mikelewis for doc pathadd-mikelewis-as-doc-codeowner	Mike Lewis	2019-06-12	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch '62966-embed-zoom-call-in-issue-mvc' into 'master'	Kushal Pandya	2019-06-14	9	-5/+173
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Embed Zoom Call in Issue MVC" Closes #62966 See merge request gitlab-org/gitlab-ce!29454
\| * \ \ \	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	Simon Knox	2019-06-15	77	-12316/+126491
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	62966-embed-zoom-call-in-issue-mvc
\| * \| \| \| \|	Add Join meeting button to Issues with Zoom links62966-embed-zoom-call-in-issue-mvc	Simon Knox	2019-06-14	9	-5/+173
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Detect links containing zoom.us followed by j, s, or my Add link below Issue title that links to Zoom meeting
* \| \| \| \| \|	Merge branch 'specify-dashboard-name' into 'master'	Mayra Cabrera	2019-06-14	5	-3/+55
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Specify a dropdown name for dashboards See merge request gitlab-org/gitlab-ce!29343
\| * \| \| \| \|	Specify a dropdown name for dashboards	Sarah Yasonik	2019-06-14	5	-3/+55
\|/ / / / /
* \| \| \| \|	Merge branch 'diff-suggestions-popover' into 'master'	Filipa Lacerda	2019-06-14	25	-79/+269
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added diff suggestion popover Closes #56523 See merge request gitlab-org/gitlab-ce!29473
\| * \| \| \| \|	Added diff suggestion popover	Phil Hughes	2019-06-14	25	-79/+269
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56523
* \| \| \| \|	Merge branch 'add-variables-license-management-docs' into 'master'	Achilleas Pipinellis	2019-06-14	1	-0/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	referring environment variables See merge request gitlab-org/gitlab-ce!29676
\| * \| \| \| \|	referring environment variables	Can Eldem	2019-06-14	1	-0/+3
\|/ / / / /
* \| \| \| \|	Merge branch '62097-update-gl-pagination' into 'master'	Filipa Lacerda	2019-06-14	7	-40/+85
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade gitlab-ui and migrate gl-pagination Closes #62097 See merge request gitlab-org/gitlab-ce!29555
\| * \| \| \| \|	Upgrade gitlab-ui and migrate gl-pagination	Paul Gascou-Vaillancourt	2019-06-14	7	-40/+85
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Upgraded gitlab-ui to v4.0.0 - Migrated pagination_links to reflect breaking changes introduced in gitlab-ui v4.0.0
* \| \| \| \|	Merge branch 'master-i18n' into 'master'	Bob Van Landuyt	2019-06-14	45	-12197/+126134
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Master i18n See merge request gitlab-org/gitlab-ce!29671
\| * \| \| \|	New translations gitlab.pot (Danish)	Luke Bennett	2019-06-14	45	-12197/+126134
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	[skip ci]
* \| \| \|	Merge branch 'docs-pull-mirroring-update' into 'master'	Marcia Ramos	2019-06-14	1	-0/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Add note clarifying the free status of pull mirroring See merge request gitlab-org/gitlab-ce!29580
\| * \| \| \|	Add free pull mirroring expiry notedocs-pull-mirroring-update	Tristan Williams	2019-06-12	1	-0/+3
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix-link-in-process-docs' into 'master'	Marcia Ramos	2019-06-14	1	-3/+1
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a broken link in PROCESS.md See merge request gitlab-org/gitlab-ce!29607
\| * \| \| \|	Fix a broken link in PROCESS.md	Nick Thomas	2019-06-13	1	-3/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'gt-fix-styling-for-pages-detail-page' into 'master'	Filipa Lacerda	2019-06-14	1	-1/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix styling for `app/assets/stylesheets/pages/detail_page.scss` Closes #59900 See merge request gitlab-org/gitlab-ce!26870
\| * \| \| \| \|	Remove unused selector	George Tsiolis	2019-06-13	1	-1/+0
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'dhiraj-fix-missing-deployment-rockets-in-monitoring-dashboard' ↵	Filipa Lacerda	2019-06-14	7	-18/+19
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Fix missing deployment rockets in monitor dashboard See merge request gitlab-org/gitlab-ce!29574
\| * \| \| \| \| \|	Fix missing deployment rockets in monitor dashboard	Dhiraj Bodicherla	2019-06-14	7	-18/+19
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed inconsistencies in variable names for deployment endpoints for monitoring dashboard which causes deployment rocket icons to disappear
* \| \| \| \| \|	Merge branch 'gitlab-ce-asciidoc-include' into 'master'	James Lopez	2019-06-14	10	-41/+747
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add support for AsciiDoc include directive Closes #18045 See merge request gitlab-org/gitlab-ce!28417
\| * \| \| \| \| \|	Add basic support for AsciiDoc include directive	Guillaume Grossetie	2019-06-14	10	-41/+747
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See http://asciidoctor.org/docs/user-manual/#include-directive
* \| \| \| \| \|	Merge branch 'fix-flyout-navs' into 'master'	Phil Hughes	2019-06-14	5	-3/+45
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix sidebar flyout navigation See merge request gitlab-org/gitlab-ce!29571
\| * \| \| \| \| \|	Fix sidebar flyout navigationfix-flyout-navs	Luke Bennett	2019-06-13	5	-3/+45
\| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show flyout nav for active item when collapsed.
* \| \| \| \| \|	Merge branch 'fix-sticky-tabs-position' into 'master'	Phil Hughes	2019-06-14	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update height of $mr-tabs-height See merge request gitlab-org/gitlab-ce!29619
\| * \| \| \| \| \|	Update height of -tabs-heightfix-sticky-tabs-position	Annabel Dunstone Gray	2019-06-13	1	-1/+1
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'gitea_import_ignore_pull_request_comments' into 'master'	Ash McKenzie	2019-06-14	2	-10/+16
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't import pull request comments from Gitea repos Closes #63071 See merge request gitlab-org/gitlab-ce!29521
\| * \| \| \| \| \|	Improve the gitea importer test	John Kristensen	2019-06-14	1	-15/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The changes to the tests to support ignoring Gitea pull requests comments were a bit of a hack. The suggestions provided by Ash McKenzie in gitlab-org/gitlab-ce!29521 make things a bit more flexible if any future changes need to be made to the tests. The changes made to ignore
\| * \| \| \| \| \|	Don't import pull request comments from Gitea repos	John Kristensen	2019-06-12	2	-3/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The Gitea API does not provide the following API endpoint for pull request comments: /api/v1/repos/{owner}/{repo}/pulls/comments When the importer attempts to request this endpoint it receives a '404 Not Found' error which causes the import to fail. By skipping any attempts to import pull requests comments from Gitea we can ensure that the import can complete successfully.
* \| \| \| \| \| \|	Merge branch 'issue-62684' into 'master'	Andreas Brandl	2019-06-14	3	-0/+29
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issue 62684 See merge request gitlab-org/gitlab-ce!29430
\| * \ \ \ \ \ \	rebaseissue-62684	yguo	2019-06-13	0	-0/+0
\| \|\ \ \ \ \ \ \
\| \| * \ \ \ \ \ \	Update down migrate for issue-62684	yguo	2019-06-11	0	-0/+0
\| \| \|\ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \|	Add index on public_emails for users table	yguo	2019-06-11	3	-1/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean up issue-62684 Update issue-62684 changelog
\| \| * \| \| \| \| \| \| \|	Add index on public_emails for users table	yguo	2019-06-11	3	-1/+30
\| \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean up issue-62684 Update issue-62684 changelog Update down migrate for issue-62684