1. 19 Feb, 2016 6 commits
    • Douwe Maan's avatar
      Merge branch 'rs-emoji' into 'master' · da0953e6
      Douwe Maan authored
      Update Gemojione for new hotness 
      
      Before | After
      ------ | -----
      ![Screen_Shot_2016-02-12_at_3.38.43_PM](/uploads/299e5ffe38c91657085741261a678f81/Screen_Shot_2016-02-12_at_3.38.43_PM.png) | ![Screen_Shot_2016-02-12_at_3.38.09_PM](/uploads/ccee29719a6445a9efd2498391a7eea0/Screen_Shot_2016-02-12_at_3.38.09_PM.png)
      
      See merge request !2800
      da0953e6
    • Douwe Maan's avatar
      Merge branch 'fix/project-forks-page' into 'master' · f3000481
      Douwe Maan authored
      workaround for forks with an invalid repo
      
      Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13465
      
      The error occurs when a project returns a `nil` commit for a variety of reasons, I assume the repository is corrupt - perhaps as a result of a failed fork. 
      
      With this MR, we do not show forks with corrupted repos in the list of forks, as this does not seem to work anyway. A better solution is to fix the cause of the issue and/or any data integrity problem...
      
      Also fixing Sentry issue: 1180
      `undefined method 'already_forked?' for nil:NilClass `
      
      
      See merge request !2836
      f3000481
    • Douwe Maan's avatar
      Merge branch 'rs-show-owner-label' into 'master' · 554d9bf6
      Douwe Maan authored
      Allow `ProjectTeam#human_max_access` to return "Owner"
      
      
      
      See merge request !2881
      554d9bf6
    • Douwe Maan's avatar
      Merge branch 'rs-sentry-release-tracking' into 'master' · 6eacfa99
      Douwe Maan authored
      Add release tracking for Sentry
      
      
      
      See merge request !2863
      6eacfa99
    • Robert Speicher's avatar
      Merge branch 'cache-clear' into 'master' · 10354f7a
      Robert Speicher authored
      Use SCAN during 'rake cache:clear'
      
      This allows 'rake cache:clear' to delete millions of keys without
      choking. It requires Redis 2.8.0 or newer but we needed that already
      anyway.
      
      See merge request !2872
      10354f7a
    • Robert Speicher's avatar
      Merge branch 'autocrlf-lazy' into 'master' · d3e79985
      Robert Speicher authored
      Only set autocrlf when creating/updating files
      
      Related issue: gitlab-org/gitlab-ce#13457
      Details: 5619a6de1dd6fc1dfd4053810c7b11c677b7a495
      
      See merge request !2859
      d3e79985
  2. 18 Feb, 2016 9 commits
  3. 17 Feb, 2016 25 commits