Skip to content
Snippets Groups Projects
  1. Mar 27, 2018
  2. Mar 23, 2018
    • Sean McGivern's avatar
      Fix 500 error when trying to resolve non-ASCII conflicts in editor · 70af1e2e
      Sean McGivern authored
      When we added caching, this meant that calling `can_be_resolved_in_ui?` didn't
      always call `lines`, which meant that we didn't get the benefit of the
      side-effect from that, where it forced the conflict data itself to UTF-8.
      
      To fix that, make this explicit by separating the `raw_content` (any encoding)
      from the `content` (which is either UTF-8, or an exception is raised).
      70af1e2e
    • Sean McGivern's avatar
    • Jan Provaznik's avatar
      Fix issuable state indicator · 204ab7c9
      Jan Provaznik authored
      Now the issuable reference check works only in project scope, if we
      reference an issuable from a non-project resource (e.g. epics), then
      project is not set, and there is mismatch in generated issue references.
      
      This patch enables issuable reference state check also from group scope.
      
      Closes gitlab-ee#4683
      Related to #30916
      204ab7c9
  3. Mar 22, 2018
  4. Mar 21, 2018
  5. Mar 20, 2018
  6. Mar 19, 2018
  7. Mar 16, 2018
  8. Mar 15, 2018
  9. Mar 14, 2018
Loading