summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove high cardinality Prometheus metriczj-praefect-config-gitlab-ymlZeger-Jan van de Weg2019-07-051-9/+0
| | | | | | | | | The metric was used to correlate Gitaly requests to the Rails controller and action combination. However, Kibana provides better observability in this specific metric, and can handle hig cardinality much better. There's no dashboard in Grafana that currently depends on this metric being exposed.
* Merge branch 'issue-63222' into 'master'Lin Jen-Shin2019-07-043-2/+23
|\ | | | | | | | | | | | | Set default project sort method prior to initial sort on page loading Closes #63222 See merge request gitlab-org/gitlab-ce!29830
| * Set default project sort method prior to initial sort on page loadingDavid Palubin2019-07-043-2/+23
|/
* Merge branch 'fix-mwps-shows-inconsistent-sha-ce' into 'master'Douwe Maan2019-07-045-5/+13
|\ | | | | | | | | CE Port: Fix MWPS/ADMTWPS system notes shows wrong sha See merge request gitlab-org/gitlab-ce!30160
| * Fix MWPS system notes shows inconsistent shafix-mwps-shows-inconsistent-sha-ceShinya Maeda2019-07-045-5/+13
| | | | | | | | Fix the system note service
* | Merge branch 'id-groups-in-codeowners' into 'master'Douwe Maan2019-07-044-138/+13
|\ \ | | | | | | | | | | | | Backport for EE's "Allow adding groups to CODEOWNERS file" See merge request gitlab-org/gitlab-ce!29533
| * | Backports for EE's "Allow adding groups to CODEOWNERS file"Igor2019-07-044-138/+13
|/ / | | | | | | | | Some general code has been added/removed in EE version which needs to be backported in CE
* | Merge branch 'docs-remove-DOCKER_AUTH_CONFIG' into 'master'Achilleas Pipinellis2019-07-041-4/+4
|\ \ | | | | | | | | | | | | Replace the variable DOCKER_AUTH_LOGIN with DOCKER_AUTH_CONFIG See merge request gitlab-org/gitlab-ce!30339
| * | Replace the variable DOCKER_AUTH_LOGIN with DOCKER_AUTH_CONFIG Alexander Tanayno2019-07-041-4/+4
| | |
* | | Merge branch 'little-cluster-health-charts-ce' into 'master'Phil Hughes2019-07-046-141/+117
|\ \ \ | | | | | | | | | | | | | | | | Use gl-empty-state for monitor charts See merge request gitlab-org/gitlab-ce!30268
| * | | Use gl-empty-state for monitor chartslittle-cluster-health-charts-ceSimon Knox2019-07-046-141/+117
| | |/ | |/| | | | | | | Move a unit test to jest and use snapshot tests
* | | Merge branch 'ce-jej/fix-group-saml-u2f' into 'master'James Lopez2019-07-044-11/+29
|\ \ \ | | | | | | | | | | | | | | | | CE Backport of helpers for U2F and Omniauth See merge request gitlab-org/gitlab-ce!30326
| * | | OmniAuth full_host spec helperJames Edwards-Jones2019-07-044-11/+29
|/ / / | | | | | | | | | | | | | | | | | | Allows us to correctly set omniauth's full_host so redirects take the port into account. Needed when running selenium tests on a different port
* | | Merge branch 'docs-link-access-control-pages' into 'master'Achilleas Pipinellis2019-07-041-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Docs: Clearly state "access control" from Pages index Closes #55407 See merge request gitlab-org/gitlab-ce!30313
| * | | Docs: Clearly state "access control" from Pages indexMarcia Ramos2019-07-041-1/+1
|/ / /
* | | Merge branch 'patch-71' into 'master'Achilleas Pipinellis2019-07-041-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Fix incorrect link for prometheus AWS CloudWatch exporter See merge request gitlab-org/gitlab-ce!30273
| * | | Fix incorrect link for prometheus AWS CloudWatch exporterMaxim Efimov2019-07-021-1/+1
| | | |
* | | | Merge branch 'docs-api-docs-followup-1' into 'master'Achilleas Pipinellis2019-07-049-210/+231
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Docs: Clean up EE api docs that were merged to CE See merge request gitlab-org/gitlab-ce!30338
| * | | | Clean up EE api docs that were merged to CEMarcel Amirault2019-07-049-210/+231
|/ / / / | | | | | | | | | | | | | | | | | | | | Many small fixes to api docs which were merged from EE to CE, and tables cleaned up, as noted in issue https://gitlab.com/gitlab-org/gitlab-ce/issues/64072
* | | | Merge branch 'sh-fix-issue-63349' into 'master'Rémy Coutable2019-07-045-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-63349Stan Hu2019-07-035-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 Read2019-07-044-41/+48
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Resolve issues with issue docs Closes #64102 See merge request gitlab-org/gitlab-ce!30337
| * | | | Resolve proclems with issues documentationMarcel Amirault2019-07-044-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-Shin2019-07-044-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-namesHeinrich Lee Yu2019-07-044-28/+43
| | | | | | | | | | | | | | | | | | | | We don't need to find the filename from the remote URL
* | | | | Merge branch 'qa-xss' into 'master'Mark Lapierre2019-07-047-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 autocompleteRamya Authappan2019-07-047-0/+54
|/ / / /
* | | | Merge branch 'docs-similar-issues-edit' into 'master'Evan Read2019-07-0426-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 docMarcel Amirault2019-07-0426-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 Alexandre2019-07-043-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-memoryStan Hu2019-07-033-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 Read2019-07-031-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-strategyMark Lapierre2019-07-041-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 Read2019-07-031-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-fixCynthia Ng2019-07-031-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'qa/improve-performance-of-plan-issue-e2e-test' into 'master'Dan Davison2019-07-033-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 testsWalmyr Lima2019-07-033-18/+29
| |/ / / / | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14533
* | | | | Merge branch 'limit-amount-of-tests-returned' into 'master'Stan Hu2019-07-0311-88/+189
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit amount of JUnit tests returned Closes #64035 See merge request gitlab-org/gitlab-ce!30274
| * | | | | Limit amount of JUnit tests returnedKamil Trzciński2019-07-0311-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 Stittri2019-07-031-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-labelsRémy Coutable2019-07-031-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 Cabrera2019-07-031-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 Pereira2019-07-031-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | - Change it to perform_enqueued_jobs
* | | | | | Merge branch 'sh-fix-appearance-spec-failure' into 'master'Douglas Barbosa Alexandre2019-07-032-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.rbStan Hu2019-07-032-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 Artur2019-07-031-1/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add GetCommitSignatures feature flag See merge request gitlab-org/gitlab-ce!29288
| * | | | | | Add GetCommitSignatures feature flagadd-commit-signatures-feature-flagFelipe Artur2019-06-281-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 Landuyt2019-07-031-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 quarantineIgor2019-07-031-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'cache-performance_bar_allowed_user_ids-locally' into 'master'Stan Hu2019-07-032-9/+46
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache PerformanceBar.allowed_user_ids list locally instead of in Redis See merge request gitlab-org/gitlab-ce!30304
View Lorry Controller Status