1. 20 Jun, 2019 6 commits
    • Achilleas Pipinellis's avatar
      Merge branch 'docs-registry-restore-workaround' into 'master' · 150e9ba5
      Achilleas Pipinellis authored
      Documentation update for registry restore troubleshooting
      
      Closes #63163
      
      See merge request gitlab-org/gitlab-ce!29819
      150e9ba5
    • DJ Mountney's avatar
      Document the workaround for issues after registry restore · e8078ed6
      DJ Mountney authored
      Restoring the registry ends up using the wrong file permissions,
      breaking the registry.
      
      Document the workaround while we look at improvements.
      e8078ed6
    • Douwe Maan's avatar
      Merge branch 'sh-remove-import-columns-from-projects' into 'master' · ef12d7ad
      Douwe Maan authored
      Remove import columns from projects table
      
      See merge request gitlab-org/gitlab-ce!29863
      ef12d7ad
    • Douwe Maan's avatar
      Merge branch 'bvl-markdown-graphql' into 'master' · 376f2c2a
      Douwe Maan authored
      Render markdown in GraphQL
      
      See merge request gitlab-org/gitlab-ce!29700
      376f2c2a
    • Bob Van Landuyt's avatar
      Render GFM html in GraphQL · 40680858
      Bob Van Landuyt authored
      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`.
      40680858
    • Stan Hu's avatar
      Merge branch 'fix/facivon-url-if-uploads-object-store-enabled' into 'master' · adeccba1
      Stan Hu authored
      fix(favicon): get favicon_path, so it works also with uploads object store
      
      See merge request gitlab-org/gitlab-ce!29482
      adeccba1
  2. 19 Jun, 2019 34 commits