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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Allow asynchronous rebase operations to be monitored	Nick Thomas	2019-07-04	14	-38/+188
\| \| \| \| \| \| \| \| \|	This MR introduces tracking of the `rebase_jid` for merge requests. As with `merge_ongoing?`, `rebase_in_progress?` will now return true if a rebase is proceeding in sidekiq. After one release, we should remove the Gitaly-based lookup of rebases. It is much better to track this kind of thing via the database.
*	Clarify documentation of Gitlab::SidekiqStatus	Nick Thomas	2019-07-04	1	-3/+3
\| \| \| \| \|	The "running" state is ambiguous. Clarify that it covers both enqueued and actually running jobs.
*	Merge branch 'sh-fix-issue-63349' into 'master'	Rémy Coutable	2019-07-04	5	-3/+55
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Make Housekeeping button do a full garbage collection Closes #63349 See merge request gitlab-org/gitlab-ce!30289
\| *	Make Housekeeping button do a full garbage collectionsh-fix-issue-63349	Stan Hu	2019-07-03	5	-3/+55
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously the Housekeeping button and API would use the counter of last pushes to determine whether to do a full garbage collection, or whether to do one of the less comprehensive tasks: a full repack, incremental pack, or ref pack. This was confusing behavior, since a project owner might have to click the button dozens of times before a full GC would be initiated. This commit forces a full GC each time this is initiated. Note that the `ExclusiveLease` in `HousekeepingService` prevents users from clicking on the button more than once a day. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63349
* \|	Merge branch 'docs-issues-followup' into 'master'	Evan Read	2019-07-04	4	-41/+48
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Resolve issues with issue docs Closes #64102 See merge request gitlab-org/gitlab-ce!30337
\| * \|	Resolve proclems with issues documentation	Marcel Amirault	2019-07-04	4	-41/+48
\|/ / \| \| \| \| \| \| \| \| \| \|	Change csv import section to bullet list, add back missing bulk import section, and resolve minor issues raised in https://gitlab.com/gitlab-org/gitlab-ce/issues/64102
* \|	Merge branch '53357-fix-plus-in-upload-file-names' into 'master'	Lin Jen-Shin	2019-07-04	4	-28/+43
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Use GitlabUploader#filename when generating upload URLs See merge request gitlab-org/gitlab-ce!29915
\| * \|	Use #filename when generating upload URLs53357-fix-plus-in-upload-file-names	Heinrich Lee Yu	2019-07-04	4	-28/+43
\| \| \| \| \| \| \| \| \| \| \| \|	We don't need to find the filename from the remote URL
* \| \|	Merge branch 'qa-xss' into 'master'	Mark Lapierre	2019-07-04	7	-0/+54
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	E2E Test to check XSS issue in @mentions autocomplete Closes #41089 See merge request gitlab-org/gitlab-ce!29884
\| * \| \|	E2E Test to check XSS issue in @mentions autocomplete	Ramya Authappan	2019-07-04	7	-0/+54
\|/ / /
* \| \|	Merge branch 'docs-similar-issues-edit' into 'master'	Evan Read	2019-07-04	26	-377/+350
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Full Copy Edit and Refactor of Issues docs Closes #60767 See merge request gitlab-org/gitlab-ce!27553
\| * \| \|	Fix notes and update links to issues doc	Marcel Amirault	2019-07-04	26	-377/+350
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	After review, heading was changed and links to it needed to be updated, and minor tweaks to the issues docs such as note formatting
* \| \|	Merge branch 'sh-cache-flipper-checks-in-memory' into 'master'	Douglas Barbosa Alexandre	2019-07-04	3	-3/+87
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cache Flipper feature flags in L1 and L2 caches See merge request gitlab-org/gitlab-ce!30276
\| * \| \|	Cache Flipper feature flags in L1 and L2 cachessh-cache-flipper-checks-in-memory	Stan Hu	2019-07-03	3	-3/+87
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In https://gitlab.com/gitlab-com/gl-infra/production/issues/928, we saw a significant amount of network traffic and CPU usage due to Redis checking feature flags via Flipper. Since these flags are hit with every request, the overhead becomes significant. To alleviate Redis overhead, we now cache the data in the following way: * L1: A thread-local memory store for 1 minute * L2: Redis for 1 hour
* \| \| \|	Merge branch 'docs-environment-stop-git-strategy' into 'master'	Evan Read	2019-07-03	1	-0/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updates the yaml docs to match the environment docs regarding `GIT_STRATEGY=none` See merge request gitlab-org/gitlab-ce!30283
\| * \| \| \|	Update docs environment:action:stop GIT_STRATEGYdocs-environment-stop-git-strategy	Mark Lapierre	2019-07-04	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Notes that `GIT_STRATEGY` should be set to `none` so that the job doesn't fail when triggered automatically when the branch is deleted.
* \| \| \| \|	Merge branch 'docs-link-fix' into 'master'	Evan Read	2019-07-03	1	-1/+1
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Update Auto Deploy link to page instead of redirect See merge request gitlab-org/gitlab-ce!30325
\| * \| \| \|	Update link to page instead of redirectdocs-link-fix	Cynthia Ng	2019-07-03	1	-1/+1
\| \| \|/ / \| \|/\| \|
* \| \| \|	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