summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove N+1 queries with /projects/:project_id/{access_requests,members} API e...sh-fix-project-members-api-perfStan Hu2018-01-306-30/+46
* Merge branch 'fix/add-support-for-pre-receive-error-in-merge-branch' into 'ma...42613-clean-up-old-project-permissions-frontend-code42242-clean-up-error-handling-in-project-permissions-pageRobert Speicher2018-01-301-1/+7
|\
| * Add support for PreReceiveError in UserMergeBranch RPCfix/add-support-for-pre-receive-error-in-merge-branchAhmad Sherif2018-01-304-5/+11
* | Merge branch 'feature/migrate-delete-refs-to-gitaly' into 'master'Robert Speicher2018-01-307-38/+59
|\ \ | |/ |/|
| * Migrate Git::Repository#delete_refs to Gitalyfeature/migrate-delete-refs-to-gitalyAhmad Sherif2018-01-307-38/+59
* | Merge branch '41771-reduce-cardinality-of-metrics' into 'master'Grzegorz Bizon2018-01-3019-373/+622
|\ \ | |/ |/|
| * Rename Concern -> Methods41771-reduce-cardinality-of-metricsPawel Chojnacki2018-01-299-10/+10
| * add comment aabout hotspotsPawel Chojnacki2018-01-291-0/+1
| * use public_send where appropriatePawel Chojnacki2018-01-291-3/+3
| * remove unused (?) variablesPawel Chojnacki2018-01-291-3/+0
| * Use class variables for metrics provider cachePawel Chojnacki2018-01-291-6/+5
| * before -> afterPawel Chojnacki2018-01-292-2/+2
| * use define_method to define devine_metric_method. (couldn't resist)Pawel Chojnacki2018-01-291-15/+12
| * fix typo in the bucketsPawel Chojnacki2018-01-291-1/+1
| * Do not use include Gitlab::CurrentSettings unnecessarilyPawel Chojnacki2018-01-292-13/+15
| * Let mutex be initialized only oncePawel Chojnacki2018-01-291-1/+1
| * Fix wrong histograam bucketsPawel Chojnacki2018-01-292-2/+2
| * Add missing feature gate for cpu metricsPawel Chojnacki2018-01-291-1/+1
| * Fix ruby sampler specPawel Chojnacki2018-01-291-12/+10
| * Refactor metrics to use metrics dsl notationPawel Chojnacki2018-01-293-20/+24
| * Convert InfluxDB to concern. Fix uninitialized metrics when metrics code is i...Pawel Chojnacki2018-01-295-150/+157
| * Move prometheus metrics to module. Use class instance variables for metrics a...Pawel Chojnacki2018-01-294-52/+57
| * use class variable for Mutex instead of ConstPawel Chojnacki2018-01-291-2/+7
| * Cleanup rspecPawel Chojnacki2018-01-292-24/+26
| * NullMetric as a singletonPawel Chojnacki2018-01-294-3/+7
| * Avoid cascading lockingPawel Chojnacki2018-01-292-7/+13
| * Migrate and reduce the buckets of Gitaly metricsPawel Chojnacki2018-01-292-25/+12
| * Test if feature is respectedPawel Chojnacki2018-01-292-21/+54
| * Add changelogPawel Chojnacki2018-01-291-0/+5
| * Small Concern_spec cleanupPawel Chojnacki2018-01-291-3/+1
| * Add Tests for Metrics::ConcernPawel Chojnacki2018-01-292-3/+104
| * Use Global Mutex, and class instance variables usingPawel Chojnacki2018-01-291-9/+8
| * Fix rubocop warningsPawel Chojnacki2018-01-292-18/+19
| * Fix testsPawel Chojnacki2018-01-292-4/+4
| * Convert active recordPawel Chojnacki2018-01-292-11/+9
| * Fix helper methods and document metric builder optionsPawel Chojnacki2018-01-292-4/+13
| * Reduce cardinality and convert some metrics to new schemePawel Chojnacki2018-01-292-17/+22
| * Put View instrumentation and transaction memory use behind featurePawel Chojnacki2018-01-292-7/+9
| * Fix code after refactoringPawel Chojnacki2018-01-295-46/+45
| * Refactor method concern to use hashesPawel Chojnacki2018-01-292-51/+135
| * Refactor transaction metricsPawel Chojnacki2018-01-291-59/+22
| * cleanup method callPawel Chojnacki2018-01-293-35/+17
| * Actually make the new methods workPawel Chojnacki2018-01-292-23/+27
| * Initiaal implementation of metrics concernPawel Chojnacki2018-01-293-44/+96
* | Merge branch 'cal-label-fix' into 'master'Annabel Dunstone Gray2018-01-302-1/+6
|\ \
| * | Contribution calendar label cutoff fixcal-label-fixClement Ho2018-01-292-1/+6
* | | Merge branch 'feature/migrate-wiki-page-formatted-data-to-gitaly' into 'master'Robert Speicher2018-01-308-10/+55
|\ \ \
| * | | Migrate fetching wiki page formatted content to Gitalyfeature/migrate-wiki-page-formatted-data-to-gitalyAhmad Sherif2018-01-308-10/+55
| |/ /
* | | Merge branch 'rc/ignore-schema-in-ee_compat_check' into 'master'Robert Speicher2018-01-301-1/+1
|\ \ \
| * | | Ignore conflicts in db/schema.rb in Gitlab::EeCompatCheckrc/ignore-schema-in-ee_compat_checkRémy Coutable2018-01-301-1/+1
View Lorry Controller Status