summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into 38464-k8s-appsShinya Maeda2017-11-079-14/+28
|\
| * Merge branch '37442-api-branches-id-repository-branches-is-calling-gitaly-n-1...Douwe Maan2017-11-073-11/+9
| |\
| | * Pass the Gitlab::Git::Branch object to Repository#merged_to_root_ref?37442-api-branches-id-repository-branches-is-calling-gitaly-n-1-times-per-requestRémy Coutable2017-11-061-4/+1
| | * Improve performance of the /projects/:id/repository/branches API endpointRémy Coutable2017-11-063-8/+9
| * | Merge branch 'feature/custom-attributes-on-projects-and-groups' into 'master'Rémy Coutable2017-11-075-2/+14
| |\ \
| | * | Support custom attributes on groupsMarkus Koller2017-11-061-1/+8
| | * | Support custom attributes on projectsMarkus Koller2017-11-064-1/+6
| * | | Merge branch 'add-changes-count-to-merge-requests-api' into 'master'Rémy Coutable2017-11-071-0/+4
| |\ \ \
| | * | | Add changes_count to the merge requests APIadd-changes-count-to-merge-requests-apiSean McGivern2017-11-031-0/+4
| * | | | Fix GFM reference links for closed milestonesbugfix_banzai_closed_milestonesVitaliy @blackst0ne Klachkov2017-11-071-1/+1
* | | | | Merge branch 'master' into 38464-k8s-appsEric Eastwood2017-11-0644-445/+855
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'refactor-clusters' into 'master'Grzegorz Bizon2017-11-064-19/+5
| |\ \ \ \
| * \ \ \ \ Merge branch 'pawel/metrics-to-prometheus-33643' into 'master'Grzegorz Bizon2017-11-0621-350/+684
| |\ \ \ \ \
| | * | | | | Add missing mutex guard to method call metricspawel/metrics-to-prometheus-33643Pawel Chojnacki2017-11-031-12/+21
| | * | | | | Make subscriber tests pass, after refactoring metricsPawel Chojnacki2017-11-022-4/+4
| | * | | | | Use Mutex to guard metrics creation in transaction. Switch action view to thr...Pawel Chojnacki2017-11-022-28/+49
| | * | | | | move metrics for ActiveRecord, RailsCache and queue duration to instance vari...Pawel Chojnacki2017-11-023-38/+40
| | * | | | | rename BackgroundMigration to SidekiqMigrationPawel Chojnacki2017-11-023-2/+2
| | * | | | | Fix sidekiq middleware testsPawel Chojnacki2017-11-023-6/+5
| | * | | | | Remove unnecessary namespace usePawel Chojnacki2017-11-022-7/+7
| | * | | | | Tests for Web transaction and remove simple transactonPawel Chojnacki2017-11-025-264/+33
| | * | | | | Web/Sidekiq transaction splitPawel Chojnacki2017-11-023-1/+262
| | * | | | | Move labels to be initialized in constructorPawel Chojnacki2017-11-021-5/+2
| | * | | | | Avoid using Send (but is it better?) + small rubocop cleanupPawel Chojnacki2017-11-022-10/+8
| | * | | | | Cleanup metrics names and removing unnecessary cache read totalPawel Chojnacki2017-11-021-15/+5
| | * | | | | Adjust test to changed metrics methods.Pawel Chojnacki2017-11-021-1/+1
| | * | | | | Convert rails_queue_duration to metric_rails_queue_duration_secondsPawel Chojnacki2017-11-021-1/+12
| | * | | | | Add info about prometheus bucketsPawel Chojnacki2017-11-022-7/+9
| | * | | | | Guard metrics creation with a mutexPawel Chojnacki2017-11-021-7/+23
| | * | | | | Move labels tests from Metrics rack spec to Transaction specPawel Chojnacki2017-11-022-19/+19
| | * | | | | Fix rspec errors, and add more tests to MethodCall and ActionViewPawel Chojnacki2017-11-022-5/+21
| | * | | | | Fix Active record and transaction specsPawel Chojnacki2017-11-021-1/+1
| | * | | | | Fix rubocop warningsPawel Chojnacki2017-11-024-4/+3
| | * | | | | Differentiatie between class and instance methodsPawel Chojnacki2017-11-021-4/+6
| | * | | | | Split call name to module and method namePawel Chojnacki2017-11-024-10/+27
| | * | | | | More parsable labels in method performance measurementsPawel Chojnacki2017-11-022-7/+7
| | * | | | | Make transaction labels more readablePawel Chojnacki2017-11-023-34/+48
| | * | | | | Fix measure codde to work with secondsPawel Chojnacki2017-11-021-2/+2
| | * | | | | Rails cache metrics name alignmentPawel Chojnacki2017-11-021-8/+8
| | * | | | | Transaction needs to be able to describe controller action by itselfPawel Chojnacki2017-11-022-71/+73
| | * | | | | Tune bucket sizes an action labelsPawel Chojnacki2017-11-024-19/+19
| | * | | | | Add action tag to more metricsPawel Chojnacki2017-11-022-7/+30
| | * | | | | Introduce missing Action conceptPawel Chojnacki2017-11-024-33/+62
| | * | | | | Cleanup transaction metricsPawel Chojnacki2017-11-023-20/+35
| | * | | | | Cleanup sampling code and fix bug with samplers running without sleepPawel Chojnacki2017-11-025-29/+20
| | * | | | | remove common Base Sampler codePawel Chojnacki2017-11-021-53/+18
| | * | | | | Remove transaction tags and map transaction metrics to prometheusPawel Chojnacki2017-11-022-25/+24
| | * | | | | Transaction and method instrumentationPawel Chojnacki2017-11-023-26/+58
| | * | | | | Finished Ruby SamplerPawel Chojnacki2017-11-021-18/+20
| | * | | | | Add samples total and cleanupPawel Chojnacki2017-11-021-26/+53
View Lorry Controller Status