1. 06 7月, 2016 38 次提交
  2. 05 7月, 2016 2 次提交
    • S
      Merge branch 'rs-avatar_url-performance' into 'master' · 5323fe41
      Stan Hu 提交于
      Dumb-down avatar presence check in `avatar_url` methods
      
      `avatar.present?` goes through CarrierWave, and checks that the file
      exists on disk and checks its filesize. Because we're hitting the disk,
      this adds extra overhead to something where the worst-case scenario is
      rendering a broken image.
      
      Instead, we now just check that the _database attribute_ is present,
      which is good enough for our purposes.
      
      See https://gitlab.com/gitlab-org/gitlab-ce/issues/19273
      
      See merge request !5093
      5323fe41
    • J
      Merge branch 'new-mr-commit-alignment' into 'master' · 67007376
      Jacob Schatz 提交于
      Fixed avatar alignment in new MR view
      
      ## What does this MR do?
      
      Fixes the alignment of the avatar in the new MR compare view
      
      ## Screenshots (if relevant)
      
      ![Screen_Shot_2016-07-05_at_16.17.54](/uploads/9c427f66f8ef1d5ecee627e57ee61322/Screen_Shot_2016-07-05_at_16.17.54.png)
      
      See merge request !5095
      67007376