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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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 '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
\| * \| \| \| \|	Add index on public_emails for users table	yguo	2019-06-13	3	-0/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean up issue-62684 Update issue-62684 changelog Update down migrate for issue-62684
* \| \| \| \| \|	Merge branch 'rc/add_back_sidekiq_exporter' into 'master'	Stan Hu	2019-06-14	1	-0/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add back sidekiq metrics exporter See merge request gitlab-org/gitlab-ce!29647
\| * \| \| \| \| \|	Add back sidekiq metrics exporterrc/add_back_sidekiq_exporter	Ryan Cobb	2019-06-13	1	-0/+6
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'docs-correct-deploy-boards' into 'master'	Evan Read	2019-06-14	1	-6/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove incorrect docs from deploy_boards.md See merge request gitlab-org/gitlab-ce!29591
\| * \| \| \| \| \| \|	Remove incorrect docs from deploy_boards.mddocs-correct-deploy-boards	Dylan Griffith	2019-06-13	1	-6/+0
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'qa-e2e-tests-scoped-labels' into 'master'	Mark Lapierre	2019-06-14	14	-24/+98
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport of EE changes from MR !13763 See merge request gitlab-org/gitlab-ce!28983
\| * \| \| \| \| \| \| \|	Backport of EE changes from MR 13763	Walmyr	2019-06-14	14	-24/+98
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13763
* \| \| \| \| \| \| \|	Merge branch 'fix-static-analysis-visual_review_toolbar' into 'master'	Kushal Pandya	2019-06-14	4	-0/+8
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Exclude preexisting lint issues for i18n Closes #63223 See merge request gitlab-org/gitlab-ce!29649
\| * \| \| \| \| \| \| \|	Exclude preexisting lint issues for i18nfix-static-analysis-visual_review_toolbar	Thong Kuah	2019-06-14	4	-0/+8
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was done in an MR pre https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/26789
* \| \| \| \| \| \| \|	Merge branch 'patch-38' into 'master'	Evan Read	2019-06-14	1	-3/+8
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify ED25519 SSH key support See merge request gitlab-org/gitlab-ce!28167
\| * \| \| \| \| \| \|	Clarify ED25519 SSH key support	Ben Bodenmiller	2019-06-14	1	-3/+8
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'feature/require-2fa-for-all-entities-in-group' into 'master'	Thong Kuah	2019-06-14	5	-27/+126
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	inherit require 2fa for all subgroups and projects See merge request gitlab-org/gitlab-ce!24965
\| * \| \| \| \| \| \|	refactor: do not apply setting "require 2FA" for ancestor group members	Roger Meier	2019-06-13	3	-4/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	refactor: apply "require 2FA" to all subgroup and ancestor group members, ↵	Roger Meier	2019-06-13	6	-58/+116
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	when changing
\| * \| \| \| \| \| \|	fix tests for mysql db.	Roger Rüttimann	2019-06-13	1	-4/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	add changelog entry	Roger Rüttimann	2019-06-13	1	-0/+7
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	remove experiments for 2fa requirements and fix tests	Roger Rüttimann	2019-06-13	3	-4/+8
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	second try: fix mysql problem (not all users found)	Roger Rüttimann	2019-06-13	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	first try: fix mysql problem (not all users found)	Roger Rüttimann	2019-06-13	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	require update_two_factor_requirement on all sub-entities users	Roger Rüttimann	2019-06-13	3	-3/+13
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	add tests for 2fa requirment for all sub-entities members (subgroup and ↵	Roger Rüttimann	2019-06-13	1	-4/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	projects)
* \| \| \| \| \| \| \|	Merge branch '62440-vrt-make-mods' into 'master'	Mike Greiling	2019-06-14	14	-378/+571
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Review toolbar modularization Closes #62440 See merge request gitlab-org/gitlab-ce!29433
\| * \| \| \| \| \| \| \|	Breakup first pass	Sarah Groff Hennigh-Palermo	2019-06-14	14	-378/+571
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It has a lot of files because that's the point
* \| \| \| \| \| \| \|	Merge branch 'dz-update-milestones-labels-routes' into 'master'	Mike Greiling	2019-06-13	9	-15/+47
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use scoped routes for labels and milestones See merge request gitlab-org/gitlab-ce!29358
\| * \| \| \| \| \| \| \|	Use scoped routes for labels and milestones	Dmitriy Zaporozhets	2019-06-13	9	-15/+47
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update frontend code to use /-/ scope for milestones and labels routes Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \|	Merge branch 'sh-speed-up-commit-loading' into 'master'	Douglas Barbosa Alexandre	2019-06-13	3	-1/+14
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Speed up commit loads by disabling BatchLoader replace_methods See merge request gitlab-org/gitlab-ce!29633
\| * \| \| \| \| \| \| \|	Speed up commit loads by disabling BatchLoader replace_methods	Stan Hu	2019-06-13	2	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We've seen a significant performance penalty when using `BatchLoader#__replace_with!`. This defines methods on the batch loader that proxy to the 'real' object using send. The alternative is `method_missing`, which is slower. However, we've noticed that `method_missing` can be faster if: 1. The objects being loaded have a large interface. 2. We don't call too many methods on the loaded object. In production, we've seen the rendering times of the merge request widget increase as a result of loading commit data. BatchLoader attempts to call replace_methods on the lazy object, but this has a significant performance penalty. Disabling this mode (https://github.com/exAspArk/batch-loader/pull/45) appears to cut load times by about 50% for MergeRequestsController#show. Relates to https://gitlab.com/gitlab-com/gl-infra/infrastructure/issues/6941
\| * \| \| \| \| \| \| \|	Speed up merge request loads by disabling BatchLoader replace_methods	Stan Hu	2019-06-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In production, we've seen the rendering times of the merge request widget increase as a result of loading commit data. BatchLoader attempts to call replace_methods on the lazy object, but this has a significant performance penalty for modules that have many methods. Disabling this mode (https://github.com/exAspArk/batch-loader/pull/45) appears to cut load times by about 50% for MergeRequestsController#show. Relates to https://gitlab.com/gitlab-com/gl-infra/infrastructure/issues/6941
* \| \| \| \| \| \| \| \|	Merge branch 'ensure_namespace' into 'master'	Thong Kuah	2019-06-13	2	-1/+6
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	AutoDevops fix ensure_namespace() does not explicitly test namespace Closes #50797 See merge request gitlab-org/gitlab-ce!29567
\| * \| \| \| \| \| \| \| \|	AutoDevops fix ensure_namespace() does not explicitly test namespace	Jack Lei	2019-06-13	2	-1/+6
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'target-slo-defects' into 'master'	Mek Stittri	2019-06-13	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change SLA to target SLO for bugs and defects See merge request gitlab-org/gitlab-ce!29615