Skip to content
Snippets Groups Projects
  1. Mar 28, 2018
  2. Mar 27, 2018
  3. 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
  4. Mar 22, 2018
  5. Mar 21, 2018
  6. Mar 20, 2018
  7. Mar 19, 2018
  8. Mar 16, 2018
  9. Mar 15, 2018
  10. Mar 14, 2018
    • Bob Van Landuyt's avatar
      Import multiple issue assignees from GitLab export · ca8f1ed9
      Bob Van Landuyt authored
      When importing from a GitLab archive, an admin can carry over the
      assignations. Other users can not.
      
      When a regular user is importing an issue with multiple assignees, the
      assignee is replaced with the current user, meaning we would try to
      insert current user as an assignee multiple times.
      
      By filtering the array before storing it, the import becomes more
      robust.
      ca8f1ed9
Loading