summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Add User#full_private_access? to check if user has Private accesstc-refactor-projects-finder-init-collectionToon Claes2017-06-232-3/+17
| | | | | | | | | | | | | In CE only the admin has access to all private groups & projects. In EE also an auditor can have full private access. To overcome merge conflicts, or accidental incorrect access rights, abstract this out in `User#full_private_access?`. `User#admin?` now only should be used for admin-only features. For private access-related features `User#full_private_access?` should be used. Backported from gitlab-org/gitlab-ee!2199
* Merge branch 'fix/properly-encode-gitaly-diffs' into 'master'Robert Speicher2017-06-221-0/+8
|\ | | | | | | | | Encode Gitaly diff patches properly See merge request !12368
| * Encode Gitaly diff patches properlyfix/properly-encode-gitaly-diffsAhmad Sherif2017-06-221-0/+8
| |
* | Merge branch '28717-additional-metrics-review-branch' into 'master'Grzegorz Bizon2017-06-2221-6/+1271
|\ \ | | | | | | | | | | | | | | | | | | Support additional prometheus metrics - review branch Closes #28717 See merge request !11712
| * \ Merge remote-tracking branch 'upstream/master' into ↵28717-additional-metrics-review-branchPawel Chojnacki2017-06-22611-3310/+4535
| |\ \ | | | | | | | | | | | | 28717-additional-metrics-review-branch
| * | | Make queries not die when underlying data cannot be foundPawel Chojnacki2017-06-201-2/+2
| | | |
| * | | Add rescue_from(ActionController::UnknownFormat) in Application ControllerPawel Chojnacki2017-06-201-0/+30
| | | |
| * | | Memoize only yaml loading methodPawel Chojnacki2017-06-161-5/+0
| | | |
| * | | move additional_metrics.yaml into prometheus/ config folderPawel Chojnacki2017-06-161-1/+1
| | | |
| * | | Move Prometheus service to project modelPawel Chojnacki2017-06-163-5/+6
| | | |
| * | | Fix prometheus service frontend fixturePawel Chojnacki2017-06-162-3/+3
| | | |
| * | | Merge remote-tracking branch 'upstream/master' into ↵Pawel Chojnacki2017-06-16433-2461/+9536
| |\ \ \ | | | | | | | | | | | | | | | 28717-additional-metrics-review-branch
| * | | | cleanup wipPawel Chojnacki2017-06-163-6/+9
| | | | |
| * | | | Use include ActiveModel::Model to hold metrics data parsed from yaml.Pawel Chojnacki2017-06-162-13/+14
| | | | |
| * | | | Test Additional metrics parser and fix query checking testsPawel Chojnacki2017-06-092-1/+251
| | | | |
| * | | | Merge remote-tracking branch 'upstream/master' into ↵Pawel Chojnacki2017-06-07258-2067/+7637
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 28717-additional-metrics-review-branch # Conflicts: # app/models/project_services/prometheus_service.rb # app/views/projects/services/_form.html.haml
| * | | | | Remove unecessary before blockPawel Chojnacki2017-06-071-4/+0
| | | | | |
| * | | | | Use explicit instance of prometheus service and add access methods to itPawel Chojnacki2017-06-074-10/+104
| | | | | |
| * | | | | Add schema matcher for non response objects + use schema to test additional ↵Pawel Chojnacki2017-06-064-71/+88
| | | | | | | | | | | | | | | | | | | | | | | | metrics compliance
| * | | | | expand Namespaces:: and refactoring yaml parsing out of MetricGroup classPawel Chojnacki2017-06-064-4/+4
| | | | | |
| * | | | | Explicitly require format.json in prometheus_controllerPawel Chojnacki2017-06-061-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | + add missing prometheus_controller tests!
| * | | | | Fix prometheus service testsPawel Chojnacki2017-06-062-2/+16
| | | | | |
| * | | | | Fix transient error in deployment testPawel Chojnacki2017-06-061-0/+4
| | | | | |
| * | | | | Remove orig file + rubocop cleanupPawel Chojnacki2017-06-053-20/+10
| | | | | |
| * | | | | Cleanup Additional Metrics testsPawel Chojnacki2017-06-056-68/+20
| | | | | |
| * | | | | Refactor Metric tests to use more common codePawel Chojnacki2017-06-053-19/+16
| | | | | |
| * | | | | Additional Metrics of deployment testsPawel Chojnacki2017-06-054-142/+179
| | | | | |
| * | | | | Environments#additional_metrics testsPawel Chojnacki2017-06-052-0/+133
| | | | | |
| * | | | | Test Partial additional query responsePawel Chojnacki2017-06-051-9/+45
| | | | | |
| * | | | | Additional metrics test using multiple groupsPawel Chojnacki2017-06-053-32/+111
| | | | | |
| * | | | | Additional Metrics testsPawel Chojnacki2017-06-054-4/+104
| | | | | |
| * | | | | Towards Reviewable prometheusPawel Chojnacki2017-06-053-31/+143
| | | | | |
| * | | | | Matched Metrics testsPawel Chojnacki2017-06-051-0/+50
| | | | | |
| * | | | | Update as per review feedbackkushalpandya2017-06-011-1/+34
| | | | | |
| * | | | | Tests for `PrometheusMetrics` classkushalpandya2017-06-012-0/+166
| | | | | |
| * | | | | Prometheus Service Fixture Generatorkushalpandya2017-05-311-0/+31
| | | | | |
| * | | | | Add support for Prometheus Servicekushalpandya2017-05-311-0/+8
| | | | | |
| * | | | | Add Prometheus client testsPawel Chojnacki2017-05-302-0/+76
| | | | | |
* | | | | | Merge branch ↵Jacob Schatz2017-06-223-28/+125
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '34010-fix-linking-to-parallel-diff-line-number-creating-gray-box' into 'master' Fix linking to line number on parallel diff creating empty discussion box Closes #34010 See merge request !12332
| * | | | | | Fix linking to line number on parallel diff creating empty discussion34010-fix-linking-to-parallel-diff-line-number-creating-gray-boxEric Eastwood2017-06-213-28/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/34010
* | | | | | | Resolve "Can't sort Groups"Alfredo Sumaran2017-06-221-1/+23
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch '32301-filter-archive-project-on-param-present' into 'master'Rémy Coutable2017-06-221-0/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filter archived project in API only if param present Closes #32301 See merge request !12245
| * | | | | | Filter archived project in API v3 only if param presentvanadium232017-06-211-0/+30
| | | | | | |
* | | | | | | Merge branch 'dm-restore-capybara-screenshot' into 'master'Robert Speicher2017-06-221-2/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't reset the session when the example failed to fix capybara-screenshot See merge request !12370
| * | | | | | | Don't reset the session when the example failed, because we need ↵dm-restore-capybara-screenshotDouwe Maan2017-06-211-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | capybara-screenshot to have access to it
* | | | | | | | Merge branch '33833-issue-and-mr-state-tabs-don-t-work-on-dashboard' into ↵Jacob Schatz2017-06-222-0/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Issue and MR state tabs don't work on dashboard" Closes #33833 See merge request !12278
| * | | | | | | Add feature spec for dashboard state filter tabs33833-issue-and-mr-state-tabs-don-t-work-on-dashboardEric Eastwood2017-06-211-0/+5
| | | | | | | |
| * | | | | | | Revert to using links instead of buttons in Issuable Index tabs.Bryce Johnson2017-06-211-0/+3
| |/ / / / / /
* | | | | | | Merge branch 'feature/migrate-blob-find-to-gitaly' into 'master'Robert Speicher2017-06-222-2/+11
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | Migrate Gitlab::Git::Blob.find to Gitaly See merge request !12104
| * | | | | | Migrate Gitlab::Git::Blob.find to Gitalyfeature/migrate-blob-find-to-gitalyAhmad Sherif2017-06-212-2/+11
| | | | | | |
View Lorry Controller Status