Skip to content
Snippets Groups Projects
  1. Apr 14, 2018
  2. Apr 13, 2018
  3. Apr 12, 2018
    • Zeger-Jan van de Weg's avatar
      Deprecate legacy disk paths · a752c56c
      Zeger-Jan van de Weg authored
      Direct disk access is impossible on environments where components run in
      their own container. There for constructing the path should not be done
      except for exceptional cases.
      
      One of the considerations, instead of logging, was to use Sentry. For
      now I've chosen not to use this as the impact of this change is hard to
      determine. Getting this in now will allow us to checkout the impact on
      dev.gitlab.org and staging.
      Unverified
      a752c56c
    • Rubén Dávila's avatar
      Backport of EE !4989 · d28b1dfc
      Rubén Dávila authored
      d28b1dfc
  4. Apr 11, 2018
  5. Apr 06, 2018
  6. Apr 04, 2018
  7. Apr 03, 2018
  8. Mar 30, 2018
  9. Mar 27, 2018
  10. 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
  11. Mar 22, 2018
  12. Mar 21, 2018
  13. Mar 19, 2018
  14. Mar 16, 2018
  15. Mar 15, 2018
  16. Mar 12, 2018
  17. Mar 08, 2018
  18. Mar 07, 2018
Loading