1. 17 6月, 2016 36 次提交
  2. 16 6月, 2016 4 次提交
    • P
      Use Git cached counters on project show page · 5d33af5e
      Paco Guzman 提交于
      Besides when building the repository cache we cache 
      those git counters too
      5d33af5e
    • D
      Merge branch '18474-missing-images-on-confirmation-email' into 'master' · db66312c
      Douwe Maan 提交于
      Fix images in emails
      
      Closes #18474. The confirmation email is actually the only one that uses the `image_tag` helper at the moment, but this will work for all of them:
      ```shell
      $ ag image_tag -G mailer
      app/views/layouts/devise_mailer.html.haml
      13:              = image_tag('mailers/gitlab_header_logo.png', id: 'logo', alt: 'GitLab Wordmark')
      24:                  = image_tag('mailers/gitlab_tanuki_2x.png', alt: 'GitLab Logo')
      ```
      
      See merge request !4705
      db66312c
    • J
      Merge branch '18521-tanuki-logo' into 'master' · d9812bae
      Jacob Schatz 提交于
      Lighten each logo path color instead of white
      
      ## What does this MR do?
      Changes highlight/loading colors of tanuki from white to a lighter version of each path color
      
      ## Why was this MR needed?
      Since the logo is no longer on the dark sidebar, the highlight color was getting lost against the light gray background
      
      ## What are the relevant issue numbers?
      Closes #18521 
      
      ## Screenshots (if relevant)
      ![logo](/uploads/3743925862fa8e17d2fec426f7e4c853/logo.gif)
      
      cc @jschatz1 @lbennett @dzaporozhets 
      
      See merge request !4690
      d9812bae
    • Y
      Merge branch '18582-banzai-filter-external-link-filter' into 'master' · 0ea170b4
      Yorick Peterse 提交于
      Banzai::Filter::ExternalLinkFilter use XPath
      
      See merge request !4702
      0ea170b4