summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '42497-rubocop-style-regexpliteral' into 'master'Rémy Coutable2018-02-0126-40/+40
|\ | | | | | | | | | | | | Enable Style/RegexpLiteral cop Closes #42497 See merge request gitlab-org/gitlab-ce!16752
| * Enable RuboCop Style/RegexpLiteralTakuya Noguchi2018-02-0126-40/+40
| |
* | Merge branch 'repository-log-disable-walk' into 'master'Douwe Maan2018-01-312-25/+2
|\ \ | | | | | | | | | | | | Remove Rugged::Walk implementation of #log See merge request gitlab-org/gitlab-ce!16798
| * | Remove Rugged::Walk implementation of #logrepository-log-disable-walkJacob Vosmaer2018-01-312-25/+2
| | |
* | | Merge branch 'rugged-reference-cache-rescue' into 'master'Sean McGivern2018-01-311-0/+2
|\ \ \ | |_|/ |/| | | | | | | | Stop rescuing Rugged::Reference in Repository cache See merge request gitlab-org/gitlab-ce!16770
| * | Remove Rugged exception in cache rescuerugged-reference-cache-rescueJacob Vosmaer2018-01-301-0/+2
| | |
* | | Merge branch 'zj-gitaly-server-info' into 'master'Sean McGivern2018-01-311-0/+16
|\ \ \ | | | | | | | | | | | | | | | | Gitaly Server info for admin panel See merge request gitlab-org/gitlab-ce!16794
| * | | Gitaly Server info for admin panelZeger-Jan van de Weg2018-01-311-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements the client side for gitlab-org/gitaly#819. Which is a server info command. This checks the server version and git binairy version on the server. A small UI was added for administrators, so they can check the status of the Gitaly server. This is done for each storage the monolith knows. Because of this commit, gitlab-org/gitlab-ce!15580 is now closed. That MR removed the Git version too, but didn't replace it with anything.
* | | | Merge branch 'fix/move-can-be-merged-to-lib-git' into 'master'Grzegorz Bizon2018-01-311-0/+18
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Move Repository#can_be_merged? to Gitlab::Git::Repository Closes #42544 See merge request gitlab-org/gitlab-ce!16771
| * | | Move Repository#can_be_merged? to Gitlab::Git::Repositoryfix/move-can-be-merged-to-lib-gitAhmad Sherif2018-01-301-0/+18
| | | | | | | | | | | | | | | | Fixes #42544
* | | | Merge branch 'fix/add-support-for-pre-receive-error-in-merge-branch' into ↵42613-clean-up-old-project-permissions-frontend-code42242-clean-up-error-handling-in-project-permissions-pageRobert Speicher2018-01-301-1/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add support for PreReceiveError in UserMergeBranch RPC Closes gitaly#979 See merge request gitlab-org/gitlab-ce!16765
| * | | | Add support for PreReceiveError in UserMergeBranch RPCfix/add-support-for-pre-receive-error-in-merge-branchAhmad Sherif2018-01-301-1/+7
| | | | | | | | | | | | | | | | | | | | Closes gitaly#979
* | | | | Merge branch 'feature/migrate-delete-refs-to-gitaly' into 'master'Robert Speicher2018-01-302-13/+30
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Migrate Git::Repository#delete_refs to Gitaly Closes gitaly#967 See merge request gitlab-org/gitlab-ce!16723
| * | | | Migrate Git::Repository#delete_refs to Gitalyfeature/migrate-delete-refs-to-gitalyAhmad Sherif2018-01-302-13/+30
| | | | | | | | | | | | | | | | | | | | Closes gitaly#967
* | | | | Merge branch '41771-reduce-cardinality-of-metrics' into 'master'Grzegorz Bizon2018-01-3011-324/+450
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Reduce the cardinality of GitLab metrics Closes #41771 See merge request gitlab-org/gitlab-ce!16443
| * | | | Rename Concern -> Methods41771-reduce-cardinality-of-metricsPawel Chojnacki2018-01-298-8/+8
| | | | |
| * | | | add comment aabout hotspotsPawel Chojnacki2018-01-291-0/+1
| | | | |
| * | | | remove unused (?) variablesPawel Chojnacki2018-01-291-3/+0
| | | | |
| * | | | Use class variables for metrics provider cachePawel Chojnacki2018-01-291-6/+5
| | | | |
| * | | | 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
| | | | |
| * | | | Refactor metrics to use metrics dsl notationPawel Chojnacki2018-01-293-20/+24
| | | | |
| * | | | Convert InfluxDB to concern. Fix uninitialized metrics when metrics code is ↵Pawel Chojnacki2018-01-294-148/+152
| | | | | | | | | | | | | | | | | | | | inherited.
| * | | | Move prometheus metrics to module. Use class instance variables for metrics ↵Pawel Chojnacki2018-01-294-52/+57
| | | | | | | | | | | | | | | | | | | | and metrics cache in metrics concern
| * | | | use class variable for Mutex instead of ConstPawel Chojnacki2018-01-291-2/+7
| | | | |
| * | | | Cleanup rspecPawel Chojnacki2018-01-291-10/+6
| | | | |
| * | | | NullMetric as a singletonPawel Chojnacki2018-01-293-2/+4
| | | | |
| * | | | Avoid cascading lockingPawel Chojnacki2018-01-291-6/+12
| | | | |
| * | | | Migrate and reduce the buckets of Gitaly metricsPawel Chojnacki2018-01-292-25/+12
| | | | | | | | | | | | | | | | | | | | | | | | | /cc @bjk-gitlab /cc @zj
| * | | | Test if feature is respectedPawel Chojnacki2018-01-291-2/+2
| | | | |
| * | | | Add Tests for Metrics::ConcernPawel Chojnacki2018-01-291-3/+3
| | | | |
| * | | | Use Global Mutex, and class instance variables usingPawel Chojnacki2018-01-291-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` metric = @_metrics_provider_cache&.[](name) return metric if metric `` acccessor that only slightly slower (<20ns) than direct class variable access
| * | | | Fix rubocop warningsPawel Chojnacki2018-01-292-18/+19
| | | | |
| * | | | Fix testsPawel Chojnacki2018-01-291-3/+3
| | | | |
| * | | | Convert active recordPawel Chojnacki2018-01-291-10/+8
| | | | |
| * | | | 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-294-45/+44
| | | | |
| * | | | Refactor method concern to use hashesPawel Chojnacki2018-01-292-51/+135
| | | | |
| * | | | Refactor transaction metricsPawel Chojnacki2018-01-291-59/+22
| | | | |
| * | | | cleanup method callPawel Chojnacki2018-01-292-3/+5
| | | | |
| * | | | Actually make the new methods workPawel Chojnacki2018-01-292-23/+27
| | | | |
| * | | | Initiaal implementation of metrics concernPawel Chojnacki2018-01-293-44/+96
| | | | |
* | | | | Merge branch 'feature/migrate-wiki-page-formatted-data-to-gitaly' into 'master'Robert Speicher2018-01-302-0/+26
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate fetching wiki page formatted content to Gitaly Closes gitaly#958 See merge request gitlab-org/gitlab-ce!16716
| * | | | | Migrate fetching wiki page formatted content to Gitalyfeature/migrate-wiki-page-formatted-data-to-gitalyAhmad Sherif2018-01-302-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | Closes gitaly#958
* | | | | | 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::EeCompatCheck See merge request gitlab-org/gitlab-ce!16806