summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update Rakefilemvanremmerden-master-patch-23995Marcel van Remmerden2019-07-091-0/+1
|
* Merge branch '64134-edit-comment' into 'master'Kushal Pandya2019-07-096-6/+88
|\ | | | | | | | | | | | | Resolve "Clicking edit button in a thread reply doesn’t work" Closes #64134 See merge request gitlab-org/gitlab-ce!30424
| * Fixed editing formNatalia Tepluhina2019-07-096-6/+88
|/ | | | | | - applied functional component patch - fixed border radius for list - fixed Karma test to take a correct li amount
* Merge branch 'allow-reactive-caching-of-nil' into 'master'Stan Hu2019-07-094-29/+40
|\ | | | | | | | | Allow ReactiveCaching to support nil value See merge request gitlab-org/gitlab-ce!30456
| * Change changelog type to performanceallow-reactive-caching-of-nilFabio Pitino2019-07-081-1/+1
| |
| * Allow ReactiveCaching to support nil valueFabio Pitino2019-07-084-29/+40
| | | | | | | | | | | | | | | | | | | | | | | | When :calculate_reactive_caching returns a nil value this caused ReactiveCaching to schedule a worker every time the code using :with_reactive_cache was called. This issue caused an increasing amount of Sidekiq jobs being created continuously. Implementing this fix behind feature flag :reactive_caching_check_key_exists
* | Merge branch 'add-ff-embedding-metrics' into 'master'Stan Hu2019-07-091-0/+5
|\ \ | | | | | | | | | | | | Push feature flag for embedding metrics See merge request gitlab-org/gitlab-ce!30342
| * | Push feature flag for embedding metricsSarah Yasonik2019-07-091-0/+5
|/ /
* | Merge branch '62756-follow-up-user-info-in-auth-log' into 'master'Stan Hu2019-07-091-1/+1
|\ \ | | | | | | | | | | | | Limit user information to RackAttack throttles See merge request gitlab-org/gitlab-ce!30467
| * | Limit user information to RackAttack throttlesMayra Cabrera2019-07-091-1/+1
|/ / | | | | | | | | | | | | | | rack.attack.match_discriminator is only return on throttle_authenticated_api or throttle_authenticated_web requests, so we're avoiding logging user_id on blacklist requests Follow up of https://gitlab.com/gitlab-org/gitlab-ce/issues/62756
* | Merge branch 'docs-markdown-whitespaces' into 'master'Evan Read2019-07-0928-77/+67
|\ \ | | | | | | | | | | | | Docs: Remove extra whitespaces in docs See merge request gitlab-org/gitlab-ce!30493
| * | Remove extra whitespaces in docsMarcel Amirault2019-07-0928-77/+67
|/ / | | | | | | | | Removes all the extra whitespaces at end of lines, inside tags, and removes extra newlines
* | Merge branch 'centralize-markdownlint-config' into 'master'Achilleas Pipinellis2019-07-099-11/+36
|\ \ | | | | | | | | | | | | Centralize markdownlint configuration See merge request gitlab-org/gitlab-ce!30263
| * | Centralize config for markdownlintMarkus Koller2019-07-099-11/+36
|/ / | | | | | | | | | | | | | | The configuration is currently only specified in CI, by moving it into `.mdlrc` we get immediate feedback locally in supported editors. To ensure `mdl` is available it's also added to the `Gemfile`, though CI will still use the version installed in the `gitlab-docs-lint` image.
* | Merge branch 'docs/update-installation-link' into 'master'Evan Read2019-07-0911-17/+17
|\ \ | | | | | | | | | | | | Update the installation link See merge request gitlab-org/gitlab-ce!30489
| * | Update the installation linkdocs/update-installation-linkCindy Pallares2019-07-0812-18/+18
| | | | | | | | | | | | | | | The installation link has changed from /installation/ to /install/. This commit will update all the remaining links that are missing.
* | | Merge branch 'docs-redirected-links-2' into 'master'Evan Read2019-07-0923-54/+48
|\ \ \ | | | | | | | | | | | | | | | | Docs: Update redirected links in docs (part 2) See merge request gitlab-org/gitlab-ce!30441
| * | | Update redirected links to final destinationMarcel Amirault2019-07-0923-54/+48
|/ / / | | | | | | | | | | | | | | | Updating redirected links in the development, install, policy raketasks and university dirs. Should now link to final URL to avoid redirect hops
* | | Merge branch 'docs/ha-consul-server-doc-restructure' into 'master'Evan Read2019-07-082-53/+68
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Move the consul server docs to its own section Closes #63538 See merge request gitlab-org/gitlab-ce!30192
| * | | Move the consul server docs to its own sectionCindy Pallares 🦉2019-07-082-53/+68
|/ / / | | | | | | | | | | | | The consul docs are currently in the HA database section, but it should be in it's own section.
* | | Merge branch 'add-kubernetes-webcast-cta-dmp' into 'master'Evan Read2019-07-081-0/+3
|\ \ \ | | | | | | | | | | | | | | | | Add relevant webcast to drive traffic and MQLs See merge request gitlab-org/gitlab-ce!30236
| * | | Add relevant webcast to drive traffic and MQLsadd-kubernetes-webcast-cta-dmpSarah Daily2019-07-011-0/+3
| | | |
* | | | Merge branch 'if-smartcard_required_for_git_access_doc' into 'master'Evan Read2019-07-081-0/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Doc for "Require session with smartcard login for Git access" See merge request gitlab-org/gitlab-ce!30466
| * | | | Doc for "Require session with smartcard login for Git access"Imre Farkas2019-07-081-0/+28
|/ / / /
* | | | Merge branch 'docs-redirected-links-3' into 'master'Evan Read2019-07-0824-138/+136
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Docs: Update redirected links in docs (part 3) See merge request gitlab-org/gitlab-ce!30442
| * | | | Update redirected links to final destinationsMarcel Amirault2019-07-0824-138/+136
|/ / / / | | | | | | | | | | | | | | | | | | | | This updates redirected links in integration, update, user and workflow dirs. Should now link to final URLs to avoid redirect hops
* | | | Merge branch 'qa-autodevops-disable-jobs' into 'master'Dan Davison2019-07-081-8/+47
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Disable parts of the QA AutoDevOps Pipeline See merge request gitlab-org/gitlab-ce!30427
| * | | Disable parts of the AutoDevOps Pipelineddavison2019-07-081-8/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Jobs Disabled: Code-Quality, DAST, Container-Scanning, Dependency-Scanning, License-Management, SAST Jobs still enabled: Build, Test, Deploy, Browser-Performance-Testing
* | | | Merge branch 'sh-bump-prom-mmap-gem' into 'master'Mayra Cabrera2019-07-082-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Bump prometheus-client-mmap to 0.9.8 See merge request gitlab-org/gitlab-ce!30479
| * | | | Bump prometheus-client-mmap to 0.9.8sh-bump-prom-mmap-gemStan Hu2019-07-082-3/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | This fixes a critical error where a nil exception would be hit if an error occurred while logging a Prometheus metric: https://gitlab.com/gitlab-org/prometheus-client-mmap/merge_requests/36
* | | | Merge branch '64260-i18n-broken-boards-blank-state' into 'master'Phil Hughes2019-07-081-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "i18n Broken - Boards blank state" Closes #64260 See merge request gitlab-org/gitlab-ce!30464
| * | | | Fix - use `s__` for namespaced translations64260-i18n-broken-boards-blank-stateEzekiel Kigbo2019-07-081-4/+4
| | | | |
* | | | | Merge branch '62214-follow-up-schedule-aggregation-in-other-contexts' into ↵Mayra Cabrera2019-07-083-2/+80
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | 'master' Update group statistics when some columns on ProjectStatistics are updated See merge request gitlab-org/gitlab-ce!30329
| * | | | Schedule namespace aggregation in other contextsMayra Cabrera2019-07-083-2/+80
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Schedules a Namespace::AggregationSchedule worker if some of the project statistics are refreshed. The worker is only executed if the feature flag is enabled.
* | | | Merge branch '63362-follow-up-from-visual-review-toolbar-docs' into 'master'Achilleas Pipinellis2019-07-082-34/+92
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Follow-up from "Visual Review Toolbar Docs"" Closes #63362 See merge request gitlab-org/gitlab-ce!30040
| * | | | Refactor the Visual Reviews docsAchilleas Pipinellis2019-07-082-34/+92
|/ / / / | | | | | | | | | | | | Reorganize and better explain what Visual Reviews are
* | | | Merge branch 'run-pipeline-for-merge-train-at-train-ref-ce' into 'master'Kamil Trzciński2019-07-084-0/+56
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | CE Port: Fix race condition of `refs/merge` competing overwrite See merge request gitlab-org/gitlab-ce!30308
| * | | | Fix race condition on merge train ref generationrun-pipeline-for-merge-train-at-train-ref-ceShinya Maeda2019-07-084-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Today, Pipelines for merge train run on `refs/merge`, however, this causes a race condition that it can be overwritten by CheckMergeabilityService. This patch fixes the problem by generating `refs/train` for those pipelines.
* | | | | Merge branch 'jc-detect-nfs-for-rugged' into 'master'Dmitriy Zaporozhets2019-07-0810-7/+171
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Use Rugged if we detect storage is NFS and we can access the disk See merge request gitlab-org/gitlab-ce!29725
| * | | | Use Rugged if we detect storage is NFS and we can access the diskjc-detect-nfs-for-ruggedJohn Cai2019-07-0510-7/+171
| | | | | | | | | | | | | | | | | | | | | | | | | Add a module we use as a singleton to determine whether or not rails is able to access the disk
* | | | | Merge branch '63475-fix-n-1' into 'master'Lin Jen-Shin2019-07-0812-254/+268
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Reduce N+1 queries in MergeRequestsController#ci_environment_status See merge request gitlab-org/gitlab-ce!30224
| * | | | | Add retry:0 for controller specs n+163475-fix-n-1Thong Kuah2019-07-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | As a workaround for https://gitlab.com/gitlab-org/gitlab-ce/issues/64116
| * | | | | BE feedback: memoize deployment_metricsThong Kuah2019-07-081-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also memoize has_metrics? as well, that might be expensive, and it should not change for the lifetime of EnvironmentStatus
| * | | | | Restore fallback to deployment_platform_clusterThong Kuah2019-07-083-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | In 12.2 we will remove this fallback.
| * | | | | Remove un-used methodThong Kuah2019-07-082-33/+0
| | | | | | | | | | | | | | | | | | | | | | | | We stopped calling the fallback so we can remove this now
| * | | | | Could not address last 5 queriesThong Kuah2019-07-081-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Split into followup issue
| * | | | | Extract deployment_metrics into own objectThong Kuah2019-07-088-196/+205
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can now share project so that we don't have to load project twice. Also, this extracts non-relevant logic out of Deployment. Update DeploymentsController accordingly
| * | | | | Share project object in EnvironmentStatusThong Kuah2019-07-083-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise, each EnvironmentStatus object instantiates its own project when really they are the same. Improves query count performance
| * | | | | Remove fallback to project.deployment_platformThong Kuah2019-07-083-18/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This improves query performance of MergeRequestsController#ci_environments_status a lot. However this means old deployments that deployed to kubernetes clusters with prometheus installations will no longer show performance metrics as we cannot backfill cluster_id from deployment_platform with certainty (clusters may be edited/added/deleted, which changes the results of deployment_platform).
| * | | | | Add failing test showing N+1Thong Kuah2019-07-081-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | We have an N+1 problem where N is environments.