summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | 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 ↵Pawel Chojnacki2018-01-295-150/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /cc @bjk-gitlab /cc @zj
| * | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` 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-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 fix See merge request gitlab-org/gitlab-ce!16769
| * | | | | | | | | | 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 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-308-10/+55
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | Ignore conflicts in db/schema.rb in Gitlab::EeCompatCheckrc/ignore-schema-in-ee_compat_checkRémy Coutable2018-01-301-1/+1
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The conflicts are simple enought to resolve that we don't need to bother developers with those. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | Merge branch '42591-update-nokogiri' into 'master'Stan Hu2018-01-303-3/+8
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Update Nokogiri to 1.8.2" Closes #42591 See merge request gitlab-org/gitlab-ce!16807
| * | | | | | | | | | | Update Nokogiri to 1.8.2Rémy Coutable2018-01-303-3/+8
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | Merge branch 'gitaly-784-repo-write-ref' into 'master'Douwe Maan2018-01-303-4/+34
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Git::Repository#write_ref to Gitaly Closes gitaly#784 See merge request gitlab-org/gitlab-ce!16513
| * | | | | | | | | | | Migrate Git::Repository#write_ref to Gitalygitaly-784-repo-write-refKim "BKC" Carlbäcker2018-01-303-4/+34
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch '21554-mark-new-user-as-external' into 'master'Douwe Maan2018-01-303-10/+27
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Login via OAuth marked as "external" should only mark new users as "external", not existing ones Closes #21554 See merge request gitlab-org/gitlab-ce!16672
| * | | | | | | | | | | Only new users get marked as external21554-mark-new-user-as-externalTiago Botelho2018-01-303-10/+27
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch ↵Douwe Maan2018-01-303-0/+17
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '42160-error-500-loading-merge-request-undefined-method-index-for-nil-nilclass' into 'master' Resolve "Error 500 loading merge request: undefined method `index' for nil:NilClass" Closes #42160 See merge request gitlab-org/gitlab-ce!16795
| * | | | | | | | | | | Fix truncated_diff_lines for legacy notes without a line42160-error-500-loading-merge-request-undefined-method-index-for-nil-nilclassSean McGivern2018-01-303-0/+17
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It appears that some legacy diff notes on GitLab.com have invalid line codes, which means truncated_diff_lines won't work. This is just a band-aid solution, as neither the diff nor the discussion will display correctly for these notes, but they won't cause a 500 error.
* | | | | | | | | | | Merge branch 'qa-speedup-new-subgroup-click' into 'master'Grzegorz Bizon2018-01-301-1/+9
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Speed-up the click on 'New subgroup' if the 'No results' text is shown See merge request gitlab-org/gitlab-ce!16803
| * | | | | | | | | | | Speed-up the click on 'New subgroup' if the 'No results' text is shownqa-speedup-new-subgroup-clickRémy Coutable2018-01-301-1/+9
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | Merge branch 'qa-define-selectors' into 'master'Grzegorz Bizon2018-01-303-28/+23
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define QA selectors and remove EE only code Closes gitlab-qa#154 See merge request gitlab-org/gitlab-ce!16767