Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '39649-change-default-size-for-gke-cluster-creation' into 'master' | Kamil Trzciński | 2017-11-07 | 1 | -1/+1 |
|\ | |||||
| * | Resolve conflicts | bikebilly | 2017-11-07 | 26 | -263/+466 |
| |\ | |||||
| * | | Change default cluster size to n1-standard-2 | bikebilly | 2017-11-06 | 1 | -1/+1 |
* | | | Merge branch 'feature/custom-attributes-on-projects-and-groups' into 'master' | Rémy Coutable | 2017-11-07 | 5 | -2/+39 |
|\ \ \ | |||||
| * | | | Support custom attributes on projects | Markus Koller | 2017-11-06 | 5 | -2/+39 |
* | | | | Fix GFM reference links for closed milestonesbugfix_banzai_closed_milestones | Vitaliy @blackst0ne Klachkov | 2017-11-07 | 1 | -4/+30 |
| |_|/ |/| | | |||||
* | | | Merge branch 'refactor-clusters' into 'master' | Grzegorz Bizon | 2017-11-06 | 3 | -19/+46 |
|\ \ \ | |||||
| * \ \ | 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 controll... | Shinya Maeda | 2017-11-02 | 1 | -26/+0 |
| * | | | | | 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 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Only enable unicorn metrics when not in sidekiq mode. | Pawel Chojnacki | 2017-11-02 | 1 | -4/+0 |
| * | | | | | | | 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 |
| * | | | | | | | 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 |
| * | | | | | | | 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 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | 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 |
| |/ / / / / / | |||||
* | | | | | | | 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 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Replaced subject with subject.exec in spec/lib/gitlab/checks/change_access_sp... | James Edwards-Jones | 2017-11-06 | 1 | -25/+19 |
| * | | | | | | 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 | Sean McGivern | 2017-11-06 | 1 | -3/+16 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'jej/fix-lfs-changes-laziness' into 'master' | Douwe Maan | 2017-11-06 | 3 | -19/+66 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | / | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | 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 |
* | | | | | | Merge branch 'ce-gitlab-git-backport' into 'master' | Sean McGivern | 2017-11-06 | 1 | -16/+76 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | 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 |
| | |/ / / | |/| | | |