Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | before -> after | Pawel Chojnacki | 2018-01-29 | 2 | -2/+2 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | use define_method to define devine_metric_method. (couldn't resist) | Pawel Chojnacki | 2018-01-29 | 1 | -15/+12 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | fix typo in the buckets | Pawel Chojnacki | 2018-01-29 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Do not use include Gitlab::CurrentSettings unnecessarily | Pawel Chojnacki | 2018-01-29 | 2 | -13/+15 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Let mutex be initialized only once | Pawel Chojnacki | 2018-01-29 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Fix wrong histograam buckets | Pawel Chojnacki | 2018-01-29 | 2 | -2/+2 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Add missing feature gate for cpu metrics | Pawel Chojnacki | 2018-01-29 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Fix ruby sampler spec | Pawel Chojnacki | 2018-01-29 | 1 | -12/+10 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Refactor metrics to use metrics dsl notation | Pawel Chojnacki | 2018-01-29 | 3 | -20/+24 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Convert InfluxDB to concern. Fix uninitialized metrics when metrics code is ↵ | Pawel Chojnacki | 2018-01-29 | 5 | -150/+157 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | inherited. | |||||
| * | | | | | | | | | Move prometheus metrics to module. Use class instance variables for metrics ↵ | Pawel Chojnacki | 2018-01-29 | 4 | -52/+57 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and metrics cache in metrics concern | |||||
| * | | | | | | | | | use class variable for Mutex instead of Const | Pawel Chojnacki | 2018-01-29 | 1 | -2/+7 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Cleanup rspec | Pawel Chojnacki | 2018-01-29 | 2 | -24/+26 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | NullMetric as a singleton | Pawel Chojnacki | 2018-01-29 | 4 | -3/+7 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Avoid cascading locking | Pawel Chojnacki | 2018-01-29 | 2 | -7/+13 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Migrate and reduce the buckets of Gitaly metrics | Pawel Chojnacki | 2018-01-29 | 2 | -25/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /cc @bjk-gitlab /cc @zj | |||||
| * | | | | | | | | | Test if feature is respected | Pawel Chojnacki | 2018-01-29 | 2 | -21/+54 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Add changelog | Pawel Chojnacki | 2018-01-29 | 1 | -0/+5 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Small Concern_spec cleanup | Pawel Chojnacki | 2018-01-29 | 1 | -3/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Add Tests for Metrics::Concern | Pawel Chojnacki | 2018-01-29 | 2 | -3/+104 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Use Global Mutex, and class instance variables using | Pawel Chojnacki | 2018-01-29 | 1 | -9/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` metric = @_metrics_provider_cache&.[](name) return metric if metric `` acccessor that only slightly slower (<20ns) than direct class variable access | |||||
| * | | | | | | | | | Fix rubocop warnings | Pawel Chojnacki | 2018-01-29 | 2 | -18/+19 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Fix tests | Pawel Chojnacki | 2018-01-29 | 2 | -4/+4 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Convert active record | Pawel Chojnacki | 2018-01-29 | 2 | -11/+9 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Fix helper methods and document metric builder options | Pawel Chojnacki | 2018-01-29 | 2 | -4/+13 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Reduce cardinality and convert some metrics to new scheme | Pawel Chojnacki | 2018-01-29 | 2 | -17/+22 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Put View instrumentation and transaction memory use behind feature | Pawel Chojnacki | 2018-01-29 | 2 | -7/+9 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Fix code after refactoring | Pawel Chojnacki | 2018-01-29 | 5 | -46/+45 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Refactor method concern to use hashes | Pawel Chojnacki | 2018-01-29 | 2 | -51/+135 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Refactor transaction metrics | Pawel Chojnacki | 2018-01-29 | 1 | -59/+22 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | cleanup method call | Pawel Chojnacki | 2018-01-29 | 3 | -35/+17 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Actually make the new methods work | Pawel Chojnacki | 2018-01-29 | 2 | -23/+27 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Initiaal implementation of metrics concern | Pawel Chojnacki | 2018-01-29 | 3 | -44/+96 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'cal-label-fix' into 'master' | Annabel Dunstone Gray | 2018-01-30 | 2 | -1/+6 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Contribution calendar label cutoff fix See merge request gitlab-org/gitlab-ce!16769 | |||||
| * | | | | | | | | | | Contribution calendar label cutoff fixcal-label-fix | Clement Ho | 2018-01-29 | 2 | -1/+6 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'feature/migrate-wiki-page-formatted-data-to-gitaly' into 'master' | Robert Speicher | 2018-01-30 | 8 | -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-gitaly | Ahmad Sherif | 2018-01-30 | 8 | -10/+55 | |
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes gitaly#958 | |||||
* | | | | | | | | | | | Merge branch 'rc/ignore-schema-in-ee_compat_check' into 'master' | Robert Speicher | 2018-01-30 | 1 | -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_check | Rémy Coutable | 2018-01-30 | 1 | -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 Hu | 2018-01-30 | 3 | -3/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Update Nokogiri to 1.8.2" Closes #42591 See merge request gitlab-org/gitlab-ce!16807 | |||||
| * | | | | | | | | | | | Update Nokogiri to 1.8.2 | Rémy Coutable | 2018-01-30 | 3 | -3/+8 | |
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | |||||
* | | | | | | | | | | | Merge branch 'gitaly-784-repo-write-ref' into 'master' | Douwe Maan | 2018-01-30 | 3 | -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-ref | Kim "BKC" Carlbäcker | 2018-01-30 | 3 | -4/+34 | |
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch '21554-mark-new-user-as-external' into 'master' | Douwe Maan | 2018-01-30 | 3 | -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-external | Tiago Botelho | 2018-01-30 | 3 | -10/+27 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch ↵ | Douwe Maan | 2018-01-30 | 3 | -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-nilclass | Sean McGivern | 2018-01-30 | 3 | -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 Bizon | 2018-01-30 | 1 | -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-click | Rémy Coutable | 2018-01-30 | 1 | -1/+9 | |
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | |||||
* | | | | | | | | | | | Merge branch 'qa-define-selectors' into 'master' | Grzegorz Bizon | 2018-01-30 | 3 | -28/+23 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define QA selectors and remove EE only code Closes gitlab-qa#154 See merge request gitlab-org/gitlab-ce!16767 |