summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Apply reviewer feedback59587-add-graphql-loggingcharlie ablett2019-05-317-55/+82
| | | | | | | | | | | | - Comply doc with guidelines - Improve tests for readability and completeness - Separate out phases visually with newlines - Add `format_message` test - test readability - code and test structure/styling - static query analyzers - call `as_json` on `provided_variables` - add exception handling
* Move complexity/depth to `final_value`charlieablett2019-05-304-38/+33
| | | | | | Tidy tests according to reviewer comments. Move complexity and depth calls from `initial_value` to `final_value` Log variables as json
* Add `graphql_json` logfile documentationcharlieablett2019-05-301-0/+13
|
* Call analyzers from LoggerAnalyzercharlieablett2019-05-306-51/+51
| | | | | - Add changelog file - Fix failing tests
* Add GraphQL logging feature flagcharlieablett2019-05-302-2/+19
|
* Restructure complexity analyzercharlieablett2019-05-304-30/+78
| | | | | Remove instance variables for class re-use, test individual methods, use `monotonic_time`
* Implement logger analyzercharlieablett2019-05-307-39/+108
| | | | | | | - Modify GraphqlLogger to subclass JsonLogger - Replace the single-line analyser with one that can log all the GraphQL query related information in one place. - Implement analyzer behavior with spec
* New logfile for graphql queriescharlieablett2019-05-304-1/+51
| | | | | Specify dedicated logfile and logger class for GraphQL queries. Move complexity analyzer to a dedicated class.
* Merge branch 'tpresa-fix-highest-role-docs' into 'master'Achilleas Pipinellis2019-05-301-3/+3
|\ | | | | | | | | Fix highest role docs See merge request gitlab-org/gitlab-ce!28892
| * Fix highest role docsThiago Presa2019-05-301-3/+3
|/ | | | | The docs for the highest_role field was incorrectly added to the /users endpoint. This commit adds it to the /users/:id
* Merge branch 'jl-update-components-k8s-apps-docs' into 'master'Achilleas Pipinellis2019-05-301-2/+2
|\ | | | | | | | | Rename Kubernetes Cluster Apps to GitLab Managed Apps See merge request gitlab-org/gitlab-ce!28894
| * Rename Kubernetes Cluster Apps to GitLab Managed Appsjl-update-components-k8s-apps-docsJoshua Lambert2019-05-291-2/+2
| |
* | Merge branch 'qa-reload-to-check-branches-deleted' into 'master'Ramya Authappan2019-05-302-4/+6
|\ \ | | | | | | | | | | | | [QA] Reload page to check if branch is deleted See merge request gitlab-org/gitlab-ce!28583
| * | Reload page to check if branch is deletedqa-reload-to-check-branches-deletedMark Lapierre2019-05-242-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | When the "Delete merged branches" button is used the UI doesn't update automatically. So when the page is refreshed it's possible that the branch will still be present. This checks for the branch to be gone and reloads if it is not, repeating until the default timeout (60s).
* | | Merge branch 'docs-hackathon-5' into 'master'Evan Read2019-05-304-2/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Docs: Fix 4 docs to resolve follow-up issue Closes #61994 See merge request gitlab-org/gitlab-ce!28910
| * | | Docs: Fix 4 docs to resolve follow-up issueMarcel Amirault2019-05-304-2/+4
|/ / /
* | | Merge branch 'docs/third-iteration-on-writing-end-to-end-tests-doc' into ↵Mark Lapierre2019-05-302-162/+262
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Third iteration on writing end to end tests doc Closes #62158 See merge request gitlab-org/gitlab-ce!28716
| * | | Lots of adjustments in the writing tests docWalmyr2019-05-302-162/+262
|/ / /
* | | Merge branch 'qa-public-class-methods' into 'master'Mark Lapierre2019-05-301-32/+32
|\ \ \ | | | | | | | | | | | | | | | | Move public class methods out of private See merge request gitlab-org/gitlab-ce!28768
| * | | Move public class methods out of privateqa-public-class-methodsThong Kuah2019-05-271-32/+32
| | | | | | | | | | | | | | | | | | | | | | | | private modifier by itself does nothing for class methods (need `private_class_method` for that). As these are documented to be public methods in README, move them to the top.
* | | | Merge branch 'qa-ml-fix-view-commit-patch-test' into 'master'Mark Lapierre2019-05-303-16/+43
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fabricate a file via the API Closes gitlab-org/quality/nightly#42 See merge request gitlab-org/gitlab-ce!28770
| * | | | Add file via browser when testing the UIMark Lapierre2019-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that it's possible to add a file via the API we need to make sure the UI test uses the browser UI fabrication, not the API.
| * | | | Fabricate a file via the APIMark Lapierre2019-05-272-15/+42
| |/ / /
* | | | Merge branch 'docs/api-single-codebase-clean-port' into 'master'Evan Read2019-05-295-3/+677
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Port some EE API docs to CE See merge request gitlab-org/gitlab-ce!28453
| * | | | Port some EE API docs to CEAchilleas Pipinellis2019-05-295-3/+677
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following EE files had small differences with their CE counterpart so they have been ported to CE: - doc/api/boards.md - doc/api/discussions.md - doc/api/notes.md - doc/api/resource_label_events.md - doc/api/services.md
* | | | Merge branch 'docs-masked-variables-requirements' into 'master'Evan Read2019-05-291-3/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Docs: Clarify allowed characters in masked variables See merge request gitlab-org/gitlab-ce!28864
| * | | | Docs: Clarify allowed characters in masked variablesKrasimir Angelov2019-05-291-3/+2
|/ / / /
* | | | Merge branch 'ee-10587-geo-development-fdw-docs' into 'master'Evan Read2019-05-291-6/+72
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added FDW development documentation Closes gitlab-ee#10587 See merge request gitlab-org/gitlab-ce!28501
| * | | | Added FDW development documentationee-10587-geo-development-fdw-docsGabriel Mazetto2019-05-291-6/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve existing FDW documentation in `doc/development` to include additional information about the architecture and how to use FDW as a developer.
* | | | | Merge branch '61024-update-resolved-icon' into 'master'Clement Ho2019-05-294-3/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new icon if resolved Closes #61024 See merge request gitlab-org/gitlab-ce!28663
| * | | | | Add new icon if resolved61024-update-resolved-iconJarek Ostrowski2019-05-294-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unwanted change Add changelog Add check circle filled count widget Change color for consistency Remove resolve button class Merge master Change to single icon, conditional name Remove authorship Remove unnecessary added styles
* | | | | | Merge branch 'add-wiki-size-to-statistics' into 'master'Stan Hu2019-05-2923-28/+238
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add wiki size to project statistics Closes #57822 See merge request gitlab-org/gitlab-ce!25321
| * | | | | | Add spec to verify statistics without repositoriesPeter Marko2019-05-291-0/+38
| | | | | | |
| * | | | | | Add wiki size to project statisticsPeter Marko2019-05-2923-28/+200
| | | | | | |
* | | | | | | Merge branch 'renovate/gitlab-ui-3.x' into 'master'Clement Ho2019-05-293-7/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update dependency @gitlab/ui to ^3.10.1 See merge request gitlab-org/gitlab-ce!28862
| * | | | | | | Update Snapshots for MR PopoversAndrew Fontaine2019-05-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A new attribute was added to `GlPopover`, so the snapshots had to be updated to match.
| * | | | | | | Update dependency @gitlab/ui to ^3.10.1Lukas 'Eipi' Eipert2019-05-292-7/+7
| | | | | | | |
* | | | | | | | Merge branch '61646-vrt-webpack' into 'master'Mike Greiling2019-05-297-305/+269
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Serve visual review toolbar script with Webpack Closes #61646 See merge request gitlab-org/gitlab-ce!28736
| * | | | | | | | Build visual_review_toolbar with webpackSarah Groff Hennigh-Palermo2019-05-297-305/+269
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | It takes a lot of lines to move a script
* | | | | | | | Merge branch 'delete-project-in-admin' into 'master'Robert Speicher2019-05-293-4/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redirect to admin projects index if project was deleted from admin page Closes #27768 See merge request gitlab-org/gitlab-ce!28444
| * | | | | | | | Redirect to admin projects index if project was deleted from admin pageLuke Picciau2019-05-293-4/+13
|/ / / / / / / /
* | | | | | | | Merge branch 'docs/admin_jobs' into 'master'Marcia Ramos2019-05-291-0/+24
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Document Admin Area's *Jobs* page See merge request gitlab-org/gitlab-ce!28690
| * | | | | | | Document Admin Area's *Jobs* pageRussell Dickenson2019-05-291-0/+24
|/ / / / / / /
* | | | | | | Merge branch 'rack-timeout' into 'master'Mayra Cabrera2019-05-296-11/+141
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added rack-timeout Closes #53416 See merge request gitlab-org/gitlab-ce!28405
| * | | | | | | Added rack-timeout for PumaJan Provaznik2019-05-296-11/+141
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It assures that requests are aborted after 60 seconds, otherwise an exception is raised. This exception is logged by Sentry, also there is a Prometheus counter for measuring number of requests in each state.
* | | | | | | Merge branch 'docs-update-project-transfer-reqs' into 'master'Marcia Ramos2019-05-291-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: clarify project transfer permissions Closes #61879 See merge request gitlab-org/gitlab-ce!28386
| * | | | | | | Docs: clarify project transfer permissionsTristan Williams2019-05-291-3/+3
|/ / / / / / /
* | | | | | | Merge branch ↵Tim Zallmann2019-05-294-2/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '61639-flaky-spec-issue-boards-labels-creates-project-label-spec-features-boards-sidebar_spec-rb-350' into 'master' Fix dropdown position when loading remote data Closes #61639 See merge request gitlab-org/gitlab-ce!28526
| * | | | | | | Fix dropdown position when loading remote data61639-flaky-spec-issue-boards-labels-creates-project-label-spec-features-boards-sidebar_spec-rb-350Heinrich Lee Yu2019-05-274-2/+15
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Also fixes flaky spec
* | | | | | | Merge branch 'docs-hackathon-2' into 'master'Achilleas Pipinellis2019-05-291-7/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Adjust note contents to fix rendering Closes #61868 See merge request gitlab-org/gitlab-ce!28876