summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add a QA scenario for creating an issueqa-160Rémy Coutable2018-01-312-2/+18
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch '42239-fix-mysql-source-installs' into 'master'Rémy Coutable2018-01-312-44/+48
|\ | | | | | | | | | | | | Resolve "mysql-only installation from source broken: Gem::LoadError: pg is not part of the bundle" Closes #42239 See merge request gitlab-org/gitlab-ce!16810
| * Don't assume postgresql in two initializersNick Thomas2018-01-302-44/+48
| |
* | Merge branch '4635-unify-jobs-and-builds-sepc' into 'master'Rémy Coutable2018-01-312-52/+73
|\ \ | | | | | | | | | | | | Unify and split CE/EE for spec/requests/api/jobs_spec.rb See merge request gitlab-org/gitlab-ce!16804
| * | Make those files as close as EE to reduce conflicts4635-unify-jobs-and-builds-sepcLin Jen-Shin2018-01-312-52/+73
| | |
* | | Merge branch 'update-qa-docs-with-directory-req' into 'master'Grzegorz Bizon2018-01-311-0/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add note about needing to be in the `$gdk/gitlab/qa` directory for `bin/qa` to work properly See merge request gitlab-org/gitlab-ce!16824 [ci skip]
| * | | Add note about being in the `qa` directory for `bin/qa` to workupdate-qa-docs-with-directory-reqEric Eastwood2018-01-311-0/+3
| | | | | | | | | | | | | | | | | | | | I ran into some issues when trying it out https://gitlab.slack.com/archives/C3JJET4Q6/p1517384135000134
* | | | Merge branch 'ph-ajax-to-axios' into 'master'Filipa Lacerda2018-01-3115-284/+230
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Converted $.ajax calls in some JS files to axios See merge request gitlab-org/gitlab-ce!16717
| * | | | fixed failing specsph-ajax-to-axiosPhil Hughes2018-01-302-2/+2
| | | | |
| * | | | potential fix for tests crashingPhil Hughes2018-01-301-2/+3
| | | | | | | | | | | | | | | | | | | | use underscore noop instead of jquery
| * | | | EE backport for callback being optionalPhil Hughes2018-01-301-1/+1
| | | | |
| * | | | more EE backportsPhil Hughes2018-01-301-2/+10
| | | | |
| * | | | backported changed from EEPhil Hughes2018-01-301-1/+5
| | | | |
| * | | | fixed failing IDE testPhil Hughes2018-01-301-1/+1
| | | | |
| * | | | fixed more unhandled promise rejectionsPhil Hughes2018-01-302-5/+13
| | | | |
| * | | | fixed unhandled promise rejectionPhil Hughes2018-01-301-2/+4
| | | | |
| * | | | changed commits.js to axiosPhil Hughes2018-01-302-28/+49
| | | | |
| * | | | converted blob viewer to axiosPhil Hughes2018-01-302-33/+25
| | | | |
| * | | | spec fixes after API axios changePhil Hughes2018-01-303-11/+19
| | | | |
| * | | | Converted API.js to axiosPhil Hughes2018-01-305-200/+102
| | | | |
* | | | | Merge branch 'docs-42499-api-repo-archive-format-param' into 'master'Achilleas Pipinellis2018-01-311-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document format parameter for Repository Archive endpoint Closes #42499 See merge request gitlab-org/gitlab-ce!16766
| * | | | | Document format parameter for Repository Archive endpointMark Fletcher2018-01-291-0/+1
| | | | | |
* | | | | | 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-304-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes gitaly#979
* | | | | | | Merge branch 'feature/migrate-delete-refs-to-gitaly' into 'master'Robert Speicher2018-01-307-38/+59
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-307-38/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes gitaly#967
* | | | | | | Merge branch '41771-reduce-cardinality-of-metrics' into 'master'Grzegorz Bizon2018-01-3019-373/+622
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-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 ↵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
| | | | | | |
View Lorry Controller Status