1. 12 Dec, 2018 2 commits
    • Yorick Peterse's avatar
      Reinstate changes lost due to automatic merging · 749ebc1c
      Yorick Peterse authored
      The automatic merging code used `--strategy=ours`, which turned out to
      be incorrect; instead we wanted `--strategy=recursive
      --strategy-option=ours`. This small difference results in merging
      throwing away _all_ EE changes in favour of CE changes, instead of only
      doing this for conflicts.
      
      This commit ensures that EE has all the appropriate changes. The diff
      was generated by cherry picking all merge commits made since two days
      ago, picking them with `--strategy=recursive --strategy-option=ours`.
      749ebc1c
    • Praveen Arimbrathodiyil's avatar
      Specify sass ~> 3.5 in Gemfile · 060eccc7
      Praveen Arimbrathodiyil authored
      060eccc7
  2. 10 Dec, 2018 1 commit
  3. 06 Dec, 2018 4 commits
  4. 04 Dec, 2018 2 commits
  5. 03 Dec, 2018 1 commit
  6. 30 Nov, 2018 1 commit
  7. 28 Nov, 2018 1 commit
  8. 27 Nov, 2018 1 commit
  9. 26 Nov, 2018 2 commits
  10. 22 Nov, 2018 1 commit
  11. 20 Nov, 2018 1 commit
  12. 19 Nov, 2018 5 commits
  13. 18 Nov, 2018 1 commit
    • Stan Hu's avatar
      Improve memory performance by reducing dirty pages after fork() · d991ea6d
      Stan Hu authored
      The nakayoshi_fork gem works around the lack of a Ruby compacting
      garbage collecting by calling GC.start a few times to "promote" the age
      of young objects to the maximum age 3. This reduces the number of dirty
      pages and consequently improves copy-on-write behavior with unicorn
      and other forking Web application servers.
      d991ea6d
  14. 15 Nov, 2018 4 commits
  15. 14 Nov, 2018 6 commits
  16. 13 Nov, 2018 1 commit
  17. 12 Nov, 2018 2 commits
  18. 11 Nov, 2018 3 commits
  19. 10 Nov, 2018 1 commit