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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Banzai - avoid redis if attr is in DB cachebanzai-avoid-redis-if-db-cache	Mario de la Ossa	2019-07-10	12	-48/+194
\| \| \| \| \| \| \|	When cache_collection_render runs we end up reading and writing things to redis even if we already have the rendered field cached in the DB. This commit avoids using redis at all whenever we have the field already rendered in the DB cache.
*	Merge branch 'qa/improve-performance-of-plan-issue-e2e-test' into 'master'	Dan Davison	2019-07-03	3	-18/+29
\|\ \| \| \| \| \| \| \| \|	Backport EE MR that improves end-to-end tests See merge request gitlab-org/gitlab-ce!30320
\| *	Backport EE MR that improves end-to-end tests	Walmyr Lima	2019-07-03	3	-18/+29
\| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14533
* \|	Merge branch 'limit-amount-of-tests-returned' into 'master'	Stan Hu	2019-07-03	11	-88/+189
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Limit amount of JUnit tests returned Closes #64035 See merge request gitlab-org/gitlab-ce!30274
\| * \|	Limit amount of JUnit tests returned	Kamil Trzciński	2019-07-03	11	-88/+189
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently, we do not cap amount of tests returned to frontend, thus in some extreme cases we can see a MBs of data stored in Redis. This adds an upper limit of 100 tests per-suite. We will continue showing the total counters correctly, but we will limit amount of tests that will be presented.
* \| \|	Merge branch 'docs-rename-release-group-labels' into 'master'	Mek Stittri	2019-07-03	1	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename Release groups in issue_workflow.md See merge request gitlab-org/gitlab-ce!30293
\| * \| \|	Rename Release groups in issue_workflow.mddocs-rename-release-group-labels	Rémy Coutable	2019-07-03	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Based on https://about.gitlab.com/handbook/product/categories/#release-stage: - 'core release' -> 'progressive delivery' - 'supporting capabilities' -> 'release management'
* \| \| \|	Merge branch '22991-fix-sidekiq-testing-inline' into 'master'	Mayra Cabrera	2019-07-03	1	-1/+1
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change occurrence of Sidekiq::Testing.inline! Closes #22991 See merge request gitlab-org/gitlab-ce!29890
\| * \| \|	Change occurrence of Sidekiq::Testing.inline!	Reuben Pereira	2019-07-03	1	-1/+1
\|/ / / \| \| \| \| \| \| \| \| \|	- Change it to perform_enqueued_jobs
* \| \|	Merge branch 'sh-fix-appearance-spec-failure' into 'master'	Douglas Barbosa Alexandre	2019-07-03	2	-3/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix order-dependent spec failure in appearance_spec.rb Closes #64083 See merge request gitlab-org/gitlab-ce!30323
\| * \| \|	Fix order-dependent spec failure in appearance_spec.rb	Stan Hu	2019-07-03	2	-3/+2
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When file_mover_spec.rb ran, it would initialize fog-aws with `Fog::AWS::Storage::Real` service instead of `Fog::AWS::Storage::Mock` because `Fog.mock!` was not called. Ensure that we use `stub_uploads_object_storage` to prevent that from happening. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64083
* \| \|	Merge branch 'add-commit-signatures-feature-flag' into 'master'	Felipe Artur	2019-07-03	1	-1/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add GetCommitSignatures feature flag See merge request gitlab-org/gitlab-ce!29288
\| * \| \|	Add GetCommitSignatures feature flagadd-commit-signatures-feature-flag	Felipe Artur	2019-06-28	1	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds feature flag for GetCommitSignatures which got ported to go. More info: https://gitlab.com/gitlab-org/gitaly/merge_requests/1283
* \| \| \|	Merge branch 'id-fix-appearance-spec' into 'master'	Bob Van Landuyt	2019-07-03	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Put a failed example from appearance_spec in quarantine See merge request gitlab-org/gitlab-ce!30318
\| * \| \| \|	Put a failed example from appearance_spec in quarantine	Igor	2019-07-03	1	-1/+1
\|/ / / /
* \| \| \|	Merge branch 'cache-performance_bar_allowed_user_ids-locally' into 'master'	Stan Hu	2019-07-03	2	-9/+46
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cache PerformanceBar.allowed_user_ids list locally instead of in Redis See merge request gitlab-org/gitlab-ce!30304
\| * \| \| \|	Cache PerformanceBar.allowed_user_ids list locally and in Redis	Rémy Coutable	2019-07-03	2	-9/+46
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch '61005-grafanaInAdminSettingsMonitoringMenu' into 'master'	Rémy Coutable	2019-07-03	11	-0/+113
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Grafana to Admin > Monitoring menu when enabled Closes #61005 See merge request gitlab-org/gitlab-ce!28937
\| * \| \| \|	Add Grafana to Admin > Monitoring menu when enabled	Maneschi Romain	2019-07-03	11	-0/+113
\|/ / / /
* \| \| \|	Merge branch 'add-salesforce-logo' into 'master'	Dmitriy Zaporozhets	2019-07-03	3	-1/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add salesforce logo for salesforce SSO Closes #62607 See merge request gitlab-org/gitlab-ce!28857
\| * \| \| \|	Add changelog entryadd-salesforce-logo	Małgorzata Ksionek	2019-07-03	1	-0/+5
\| \| \| \| \|
\| * \| \| \|	Add salesforce logo	Małgorzata Ksionek	2019-07-03	2	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'docs/api-single-codebase' into 'master'	Marcia Ramos	2019-07-03	2	-7/+48
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Re-align CE and EE API docs See merge request gitlab-org/gitlab-ce!30294
\| * \| \| \| \|	Re-align CE and EE API docsdocs/api-single-codebase	Achilleas Pipinellis	2019-07-03	2	-7/+48
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'do-not-save-peek-request-for-unauthenticated-users' into 'master'61056-data-improvements-for-contribution-analytics	Sean McGivern	2019-07-03	2	-0/+15
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only save Peek session in Redis when Peek is enabled See merge request gitlab-org/gitlab-ce!30306
\| * \| \| \| \|	Only save Peek session in Redis when Peek is enabled	Rémy Coutable	2019-07-03	2	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch '61797-error-tracking-jest' into 'master'	Kushal Pandya	2019-07-03	8	-7/+10
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move error_tracking_frontend specs to Jest Closes #61797 See merge request gitlab-org/gitlab-ce!30211
\| * \| \| \| \| \|	Move error_tracking_frontend specs to Jest	Simon Knox	2019-07-03	8	-7/+10
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update TEST_HOST import paths. Tests all pass
* \| \| \| \| \|	Merge branch '55487-enable-group-terminals-button' into 'master'	Fatih Acet	2019-07-03	3	-37/+19
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable terminals button for group clusters Closes #55487 See merge request gitlab-org/gitlab-ce!30255
\| * \| \| \| \|	Enable terminals button for group clusters55487-enable-group-terminals-button	Tiger	2019-07-02	3	-37/+19
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'winh-jest-markdown-header' into 'master'	Paul Slaughter	2019-07-03	2	-9/+10
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate markdown header_spec.js to Jest See merge request gitlab-org/gitlab-ce!30228
\| * \| \| \| \| \|	Migrate markdown header_spec.js to Jest	Winnie Hellmann	2019-07-03	2	-9/+10
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'asciidoc-syntax-highlighting' into 'master'	Douwe Maan	2019-07-03	6	-3/+91
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable AsciiDoc syntax highlighting (using Rouge) Closes #32635 See merge request gitlab-org/gitlab-ce!29835
\| * \| \| \| \| \|	Enable AsciiDoc syntax highlighting (using Rouge)	Guillaume Grossetie	2019-07-02	6	-3/+91
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix-todo-allow_collaboration' into 'master'	Dmitriy Zaporozhets	2019-07-03	1	-0/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update TODO: allow_collaboration column renaming See merge request gitlab-org/gitlab-ce!30291
\| * \| \| \| \| \| \|	Update TODO: allow_collaboration column renamingfix-todo-allow_collaboration	Mark Chao	2019-07-03	1	-0/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'issue/55953' into 'master'	Sean McGivern	2019-07-03	33	-240/+247
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rename `discussion` to `thread` Closes #55953 See merge request gitlab-org/gitlab-ce!29553
\| * \| \| \| \| \| \| \|	Update locale.pot	Sean McGivern	2019-07-03	1	-9/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'master' into michel.engelen/gitlab-ce-issue/55953	Sean McGivern	2019-07-03	1083	-24394/+6442
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge remote-tracking branch 'origin/issue/55953' into issue/55953	Michel Engelen	2019-07-02	1	-0/+6
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # locale/gitlab.pot # spec/features/discussion_comments/commit_spec.rb
\| \| * \| \| \| \| \| \| \| \|	updated locale	Michel Engelen	2019-07-02	1	-6/+0
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	replaced `discussion` with `thread` in comment button	Michel Engelen	2019-07-02	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	updated tests to comply with the corresponding EE branch	Michel Engelen	2019-06-26	5	-9/+9
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	updated locale	Michel Engelen	2019-06-14	1	-9/+9
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	prettified noteable_discussion spec file	Michel Engelen	2019-06-14	1	-6/+4
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	fixed remaining specs for !29553	Michel Engelen	2019-06-14	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	prettified js testfile for noteable_discussion component	Michel Engelen	2019-06-14	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	updated test	Michel Engelen	2019-06-14	1	-8/+8
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	updated karma test for noteable_discussion component	Michel Engelen	2019-06-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	prettified noteable_discussion component and updated tests	Michel Engelen	2019-06-14	2	-21/+19
\| \| \| \| \| \| \| \| \| \| \|