Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix TRIGGER checks for MySQLfix-mysql-grant-check | Yorick Peterse | 2017-11-06 | 1 | -17/+5 |
| | | | | | | | | | This ensures we can check if the user has TRIGGER permissions without querying restricted tables. Thanks to Steve Norman (https://gitlab.com/stevenorman) for helping out with this merge request. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/38372 | ||||
* | Merge branch 'refactor-clusters' into 'master' | Grzegorz Bizon | 2017-11-06 | 3 | -19/+46 |
|\ | | | | | | | | | Refactor Clusters to be consisted from GcpProvider and KubernetesPlatform See merge request gitlab-org/gitlab-ce!14879 | ||||
| * | Merge branch 'master' into refactor-clusters | Shinya Maeda | 2017-11-06 | 2 | -22/+118 |
| |\ | |||||
| * | | Fix import_export failure | Shinya Maeda | 2017-11-03 | 1 | -3/+4 |
| | | | |||||
| * | | Fix spec failure. MySQL does not bite true | Shinya Maeda | 2017-11-03 | 1 | -0/+3 |
| | | | |||||
| * | | Fix tests. Remove NOT NULL constraint from cluster.user. | Shinya Maeda | 2017-11-03 | 1 | -3/+9 |
| | | | |||||
| * | | Merge branch 'master' into refactor-clusters | Shinya Maeda | 2017-11-03 | 27 | -59/+335 |
| |\ \ | |||||
| * | | | Fix out of sync with KubernetesService. Remove namespace pramas from ↵ | Shinya Maeda | 2017-11-02 | 1 | -26/+0 |
| | | | | | | | | | | | | | | | | controller. Use time_with_zone in schema. Remove Gcp::Clusters from safe_model_attributes.ym | ||||
| * | | | Merge branch 'master' into refactor-clusters | Shinya Maeda | 2017-11-02 | 7 | -104/+308 |
| |\ \ \ | |||||
| * | | | | Fix spec. Fix usage ping. Fix warnings by adding new models and attributes. | Shinya Maeda | 2017-11-01 | 2 | -3/+46 |
| | | | | | |||||
* | | | | | Merge branch 'pawel/metrics-to-prometheus-33643' into 'master' | Grzegorz Bizon | 2017-11-06 | 14 | -193/+291 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add all InfluxDB metrics to prometheus See merge request gitlab-org/gitlab-ce!13891 | ||||
| * | | | | | Only enable unicorn metrics when not in sidekiq mode. | Pawel Chojnacki | 2017-11-02 | 1 | -4/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | + remove rebased test case | ||||
| * | | | | | Make subscriber tests pass, after refactoring metrics | Pawel Chojnacki | 2017-11-02 | 4 | -7/+7 |
| | | | | | | |||||
| * | | | | | rename BackgroundMigration to SidekiqMigration | Pawel Chojnacki | 2017-11-02 | 3 | -2/+15 |
| | | | | | | |||||
| * | | | | | Fix sidekiq middleware tests | Pawel Chojnacki | 2017-11-02 | 2 | -21/+9 |
| | | | | | | |||||
| * | | | | | Tests for Web transaction and remove simple transacton | Pawel Chojnacki | 2017-11-02 | 6 | -8/+8 |
| | | | | | | |||||
| * | | | | | Cleanup metrics names and removing unnecessary cache read total | Pawel Chojnacki | 2017-11-02 | 1 | -15/+3 |
| | | | | | | |||||
| * | | | | | Adjust test to changed metrics methods. | Pawel Chojnacki | 2017-11-02 | 2 | -17/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | + remove deprecated test suite | ||||
| * | | | | | Convert rails_queue_duration to metric_rails_queue_duration_seconds | Pawel Chojnacki | 2017-11-02 | 1 | -1/+11 |
| | | | | | | |||||
| * | | | | | Move labels tests from Metrics rack spec to Transaction spec | Pawel Chojnacki | 2017-11-02 | 3 | -71/+58 |
| | | | | | | |||||
| * | | | | | Metric spec adjustment for transaction signature change | Pawel Chojnacki | 2017-11-02 | 1 | -6/+6 |
| | | | | | | |||||
| * | | | | | Fix Rubocop warnings | Pawel Chojnacki | 2017-11-02 | 3 | -4/+1 |
| | | | | | | |||||
| * | | | | | Fix rspec errors, and add more tests to MethodCall and ActionView | Pawel Chojnacki | 2017-11-02 | 3 | -4/+53 |
| | | | | | | |||||
| * | | | | | Cache spec check if prometheus metrics are triggered | Pawel Chojnacki | 2017-11-02 | 1 | -3/+15 |
| | | | | | | |||||
| * | | | | | Rails cache spec | Pawel Chojnacki | 2017-11-02 | 1 | -28/+29 |
| | | | | | | |||||
| * | | | | | Fix Active record and transaction specs | Pawel Chojnacki | 2017-11-02 | 3 | -9/+21 |
| | | | | | | |||||
| * | | | | | Ruby sampler spec | Pawel Chojnacki | 2017-11-02 | 1 | -0/+92 |
| | | | | | | |||||
| * | | | | | Cleanup transaction metrics | Pawel Chojnacki | 2017-11-02 | 1 | -0/+0 |
| | | | | | | |||||
| * | | | | | Remove transaction tags and map transaction metrics to prometheus | Pawel Chojnacki | 2017-11-02 | 2 | -33/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + clean transaction metrics + Gemfile.lock file update | ||||
| * | | | | | Add GC sampler and small refactor of samplers | Pawel Chojnacki | 2017-11-02 | 3 | -2/+2 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'remove-ensure-ref-fetched-from-controllers' into 'master' | Sean McGivern | 2017-11-06 | 3 | -7/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed the #ensure_ref_fetched from all controllers Closes #36061 See merge request gitlab-org/gitlab-ce!15129 | ||||
| * | | | | | fix the failing specremove-ensure-ref-fetched-from-controllers | micael.bergeron | 2017-11-03 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | removed the #ensure_ref_fetched from all controllers | micael.bergeron | 2017-11-03 | 2 | -6/+6 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also, I refactored the MergeRequest#fetch_ref method to express the side-effect that this method has. MergeRequest#fetch_ref -> MergeRequest#fetch_ref! Repository#fetch_source_branch -> Repository#fetch_source_branch! | ||||
* | | | | | Resolve "DashboardController#activity.json is slow due to SQL" | Francisco Javier López | 2017-11-06 | 5 | -28/+62 |
| | | | | | |||||
* | | | | | Merge branch 'jej/fs-prevent-push-when-missing-objects' into 'master' | Douwe Maan | 2017-11-06 | 1 | -16/+61 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent git push when LFS objects are missing Closes #24564 See merge request gitlab-org/gitlab-ce!13837 | ||||
| * | | | | | Replaced subject with subject.exec in ↵ | James Edwards-Jones | 2017-11-06 | 1 | -25/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | spec/lib/gitlab/checks/change_access_spec.rb | ||||
| * | | | | | Prevent git push when LFS objects are missing | James Edwards-Jones | 2017-11-06 | 1 | -2/+53 |
| | | | | | | |||||
* | | | | | | Merge branch 'ignore-legacy-routes-in-routing-spec' into 'master' | Douwe Maan | 2017-11-06 | 1 | -3/+16 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore routes matching legacy_*_redirect in route specs See merge request gitlab-org/gitlab-ce!15208 | ||||
| * | | | | | | Ignore routes matching legacy_*_redirect in route specs | Sean McGivern | 2017-11-06 | 1 | -3/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Routes with the name `legacy_*_redirect` may have wildcards deliberately, in order to support routing old paths to new paths. As long as these routes are tested independently, they do not need to fail the path regex spec. | ||||
* | | | | | | | Merge branch 'jej/fix-lfs-changes-laziness' into 'master' | Douwe Maan | 2017-11-06 | 3 | -19/+66 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | / | |_|_|_|_|/ |/| | | | | | Implement lazy popen so LfsChanges doesn't have to wait for rev-list to complete See merge request gitlab-org/gitlab-ce!15180 | ||||
| * | | | | | Gitlab::Git::RevList and LfsChanges use lazy popenjej/fix-lfs-changes-laziness | James Edwards-Jones | 2017-11-06 | 2 | -19/+49 |
| | | | | | | |||||
| * | | | | | Gitlab::Git::Popen can lazily hand output to a block | James Edwards-Jones | 2017-11-06 | 1 | -0/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows input to start processing immediately without waiting for the process to complete. This also allows long or infinite inputs to be partially processed, which will termiate the process when reading stops with SIGPIPE. | ||||
* | | | | | | Merge branch 'ce-gitlab-git-backport' into 'master' | Sean McGivern | 2017-11-06 | 1 | -16/+76 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | CE repository mirroring changes backport See merge request gitlab-org/gitlab-ce!15184 | ||||
| * | | | | | Encapsulate git operations for mirroring in Gitlab::Git | Alejandro Rodríguez | 2017-11-03 | 1 | -16/+61 |
| | | | | | | |||||
| * | | | | | Add `Gitlab::Git::Repository#fetch` command | Alejandro Rodríguez | 2017-11-03 | 1 | -0/+15 |
| | |/ / / | |/| | | | |||||
* | | | | | Add TimeCop freeze for DST and Regular timefix/sm/39817-fix-cron_parser_spec-rb | Shinya Maeda | 2017-11-05 | 1 | -6/+42 |
|/ / / / | |||||
* | | | | Merge branch 'gitaly-ff-merge' into 'master' | Rémy Coutable | 2017-11-02 | 2 | -21/+73 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Incorporate Gitaly's OperationService.UserFFBranch RPC Closes gitaly#693 See merge request gitlab-org/gitlab-ce!15040 | ||||
| * | | | | Incorporate Gitaly's OperationService.UserFFBranch RPCgitaly-ff-merge | Alejandro Rodríguez | 2017-10-31 | 2 | -21/+73 |
| | | | | | |||||
* | | | | | Merge branch 'icons-ci-icons' into 'master' | Filipa Lacerda | 2017-11-02 | 15 | -23/+23 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Convert Icons in CI to SVG Sprite Icons See merge request gitlab-org/gitlab-ce!14567 | ||||
| * | | | | | Fixes one icon test | Tim Zallmann | 2017-10-30 | 1 | -1/+1 |
| | | | | | |