summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Review feedback implementeddocs/add-another-fdw-troubleshoot-itemEvan Read2019-06-211-3/+5
|
* Add new troubleshooting step and refactor pageEvan Read2019-06-211-32/+74
|
* Merge branch 'docs/make-deploy-boards-clearer' into 'master'Evan Read2019-06-201-0/+2
|\ | | | | | | | | Make deploy_boards doc clearer about its requirements See merge request gitlab-org/gitlab-ce!29682
| * Make deploy_boards doc clearer about its requirementsJoão Cunha2019-06-201-0/+2
|/
* Merge branch 'sh-update-component-list-docs' into 'master'Evan Read2019-06-201-3/+3
|\ | | | | | | | | Update Grafana and GitLab Monitor in component list See merge request gitlab-org/gitlab-ce!29537
| * Update Grafana and GitLab Monitor in component listStan Hu2019-06-201-3/+3
|/ | | | | | | | | | | This commit checks off two of the three components in the table that we added for the CEO Challenge in Contribute 2019: * Grafana: https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/3272 * GitLab Monitor: https://gitlab.com/charts/gitlab/merge_requests/787
* Merge branch 'docs-ml-gdk-how-to-more-info' into 'master'Mark Lapierre2019-06-202-2/+29
|\ | | | | | | | | Update docs on how to run E2E tests See merge request gitlab-org/gitlab-ce!29823
| * Update docs on how to run E2E testsdocs-ml-gdk-how-to-more-infoMark Lapierre2019-06-192-2/+29
| | | | | | | | Make instructions on how to run the E2E tests against GDK more explicit and easier to find.
* | Merge branch 'zj-gitaly-usage-data' into 'master'Stan Hu2019-06-205-3/+34
|\ \ | | | | | | | | | | | | Add Gitaly data to the usage ping See merge request gitlab-org/gitlab-ce!29893
| * | Add Gitaly data to the usage pingZeger-Jan van de Weg2019-06-205-3/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitaly data wasn't available to the team, an this change is a first iteration towards understanding what data we need and how to interpret it. Later more values will be added. For now the most important thing is the filesystem String Array, as that includes data on ext4 exposure and NFS. Part of: https://gitlab.com/gitlab-org/gitlab-ce/issues/60602
* | | Merge branch '12174-add-remove-child-epic-quick-actions-doc-ce' into 'master'cmcfarland/testAchilleas Pipinellis2019-06-201-5/+7
|\ \ \ | | | | | | | | | | | | | | | | Add documentation on epic add/remove child relations quick actions See merge request gitlab-org/gitlab-ce!29860
| * | | Add documentation on epic add/remove child relations quick actions12174-add-remove-child-epic-quick-actions-doc-ceAlexandru Croitor2019-06-201-5/+7
| | | |
* | | | Merge branch 'bvl-fix-application-setting-spec-ce' into 'master'Mayra Cabrera2019-06-201-2/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Use next_instance_of instead of any_instance_of See merge request gitlab-org/gitlab-ce!29905
| * | | | Use next_instance_of instead of any_instance_ofBob Van Landuyt2019-06-201-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | For prepended classes, we need to use `expect_next_instance_of` instead of RSpecs `any_instance_of` variants.
* | | | | Merge branch 'config-yaml-differences' into 'master'Robert Speicher2019-06-2010-11/+293
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Backport changes made by EE to various YAML configuration files See merge request gitlab-org/gitlab-ce!29606
| * | | | Backport gitlab.yml.example from EEconfig-yaml-differencesYorick Peterse2019-06-206-9/+258
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To make this happen, we need to conditionally add the group_saml strategy when running tests, but only on EE. This requires some changes to Gitlab.ee? so that it can be used before/without loading the Rails environment. We also have to change how we require a few files, so this can run outside of Rails.
| * | | | Backport Prometheus YAML config from EEYorick Peterse2019-06-201-2/+2
| | | | |
| * | | | Backport Sidekiq queue names from EEYorick Peterse2019-06-201-0/+17
| | | | |
| * | | | Backport dependency decisions from EEYorick Peterse2019-06-191-0/+7
| | | | |
| * | | | Backport EE YAML settings for PostgreSQLYorick Peterse2019-06-191-0/+9
| | | | |
* | | | | Merge branch '57973-errors-in-application-settings-panel-shows-wrong-panel' ↵Sean McGivern2019-06-2028-68/+117
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Errors in application settings panel shows wrong panel See merge request gitlab-org/gitlab-ce!25434
| * | | | | Update application settings using correct actionBrett Walker2019-06-1928-68/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updating multiple application settings panels through a single action causes the incorrect action to be shown when there are errors. Instead, make each panel action handle both updating and display.
* | | | | | Merge branch 'fix-failing-master-graphql-import' into 'master'Sean McGivern2019-06-201-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed failing GraphQL file import Closes #63527 See merge request gitlab-org/gitlab-ce!29900
| * | | | | | Fixed failing GraphQL file importPhil Hughes2019-06-201-1/+1
| | | | | | |
* | | | | | | Merge branch 'severity-doc-update' into 'master'Mek Stittri2019-06-201-26/+26
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve bug severity definitions and consolidate guidance for clarity See merge request gitlab-org/gitlab-ce!29694
| * | | | | | | Improve bug severity definitions and consolidate guidance for clarityMek Stittri2019-06-201-26/+26
|/ / / / / / /
* | | | | | | Merge branch 'embedded-metrics-be' into 'master'Sean McGivern2019-06-2010-17/+196
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Add embedding support to metrics_dashboard See merge request gitlab-org/gitlab-ce!29696
| * | | | | | Add embedding flag and filter to CPU/MemSarah Yasonik2019-06-2010-17/+196
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commits adds support for metrics dashboards for embedding. If the flag 'embedded' is provided to the environments/id/metrics_dashboard endpoint, the response will be suitable for embedding in issues or other content. This is a precursor for support for embedding metrics in GFM.
* | | | | | Merge branch 'last-commit-repo-widget' into 'master'Filipa Lacerda2019-06-206-0/+397
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Render last commit widget with Vue Closes #62766 See merge request gitlab-org/gitlab-ce!29419
| * | | | | | Render tree last commit widget with VuePhil Hughes2019-06-196-0/+397
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62766
* | | | | | | Merge branch '63510-error-parsing-true-boolean-in-gitlab-jsoncache' into ↵Ash McKenzie2019-06-202-1/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Gitlab::JsonCache#parse_value ensure string Closes #63510 See merge request gitlab-org/gitlab-ce!29885
| * | | | | | | Gitlab::JsonCache#parse_value ensure string63510-error-parsing-true-boolean-in-gitlab-jsoncacheAsh McKenzie2019-06-202-1/+11
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'master-i18n' into 'master'Bob Van Landuyt2019-06-2045-1209/+2829
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | Master i18n See merge request gitlab-org/gitlab-ce!29801
| * | | | | | New translations gitlab.pot (Portuguese)Luke Bennett2019-06-2045-1209/+2829
|/ / / / / / | | | | | | | | | | | | | | | | | | [skip ci]
* | | | | | Merge branch 'link_to_issue_statistics_api_endpoint_in_docs' into 'master'Achilleas Pipinellis2019-06-201-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Link issue statistics api endpoint in the docs See merge request gitlab-org/gitlab-ce!29855
| * | | | | | Link issue statistics api endpoint in the docslink_to_issue_statistics_api_endpoint_in_docsAlexandru Croitor2019-06-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the missing link to issues_statistics api endpoint
* | | | | | | Merge branch 'docs-update-container-registry-api' into 'master'Achilleas Pipinellis2019-06-201-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Docs for Container Registry API Delete Endpoints See merge request gitlab-org/gitlab-ce!29709
| * | | | | | | Update Docs for Container Registry API Delete EndpointsJason Goodman2019-06-201-0/+5
|/ / / / / / /
* | | | | | | Merge branch 'docs/existing-knative-edit' into 'master'Achilleas Pipinellis2019-06-201-4/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add version text and edit section See merge request gitlab-org/gitlab-ce!29875
| * | | | | | | Add version text and edit sectionEvan Read2019-06-201-4/+14
|/ / / / / / /
* | | | | | | Merge branch 'docs/edit-zoom-call-link-content' into 'master'Achilleas Pipinellis2019-06-201-2/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edit new Zoom call link content See merge request gitlab-org/gitlab-ce!29878
| * | | | | | | Edit new Zoom call link contentEvan Read2019-06-201-2/+9
|/ / / / / / /
* | | | | | | Merge branch 'graphql-file-renames' into 'master'Kushal Pandya2019-06-2011-6/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename graphql files to match frontend docs See merge request gitlab-org/gitlab-ce!29856
| * | | | | | | Rename graphql files to match frontend docsPhil Hughes2019-06-1911-6/+6
| | | | | | | |
* | | | | | | | Merge branch 'docs-registry-restore-workaround' into 'master'Achilleas Pipinellis2019-06-201-0/+31
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation update for registry restore troubleshooting Closes #63163 See merge request gitlab-org/gitlab-ce!29819
| * | | | | | | | Document the workaround for issues after registry restoreDJ Mountney2019-06-201-0/+31
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restoring the registry ends up using the wrong file permissions, breaking the registry. Document the workaround while we look at improvements.
* | | | | | | | Merge branch 'sh-remove-import-columns-from-projects' into 'master'Douwe Maan2019-06-205-8/+22
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove import columns from projects table See merge request gitlab-org/gitlab-ce!29863
| * | | | | | | | Remove import columns from projects tablesh-remove-import-columns-from-projectsStan Hu2019-06-195-8/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21497, we migrated all project import data into a separate table, `project_import_data`. In addition, we also added: ``` ignore_column :import_status, :import_jid, :import_error ``` In https://gitlab.com/gitlab-com/gl-infra/production/issues/908, we observed some of these `import_error` columns consumed megabytes of error backtraces and caused slow loading of projects whenever a `SELECT * from projects` query loaded the row into memory. Since we have long migrated away from these columns, we can now drop these columns entirely.
* | | | | | | | | Merge branch 'bvl-markdown-graphql' into 'master'Douwe Maan2019-06-2019-19/+207
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Render markdown in GraphQL See merge request gitlab-org/gitlab-ce!29700
| * | | | | | | | Render GFM html in GraphQLBob Van Landuyt2019-06-2019-19/+207
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a `markdown_field` to our types. Using this helper will render a model's markdown field using the existing `MarkupHelper` with the context of the GraphQL query available to the helper. Having the context available to the helper is needed for redacting links to resources that the current user is not allowed to see. Because rendering the HTML can cause queries, the complexity of a these fields is raised by 5 above the default. The markdown field helper can be used as follows: ``` markdown_field :note_html, null: false ``` This would generate a field that will render the markdown field `note` of the model. This could be overridden by adding the `method:` argument. Passing a symbol for the method name: ``` markdown_field :body_html, null: false, method: :note ``` It will have this description by default: > The GitLab Flavored Markdown rendering of `note` This could be overridden by passing a `description:` argument. The type of a `markdown_field` is always `GraphQL::STRING_TYPE`.