1. 29 7月, 2016 7 次提交
    • S
      Clarify backup_keep_time config parameter with S3 · 7658f31a
      Stan Hu 提交于
      Discussed in gitlab-org/omnibus-gitlab#1453
      
      [ci skip]
      7658f31a
    • J
      Merge branch 'ci-icons-again' into 'master' · a330b29b
      Jacob Schatz 提交于
      Replace ci icons with slightly thicker ones
      
      ## What does this MR do?
      Adds updated CI icons
      
      ## Why was this MR needed?
      New CI icons were a tad too thin
      
      ## What are the relevant issue numbers?
      Closes #20089 
      
      ## Screenshots (if relevant)
      ![Screen_Shot_2016-07-26_at_8.59.28_AM](/uploads/35671085829fd64f8a9cf98704661ece/Screen_Shot_2016-07-26_at_8.59.28_AM.png)
      
      See merge request !5475
      a330b29b
    • R
      Merge branch 'remove-unpullable-project' into 'master' · 2080b225
      Robert Speicher 提交于
      Remove project which can't be pulled while seeding
      
      This project can't be pulled from GH when running `SIZE=20 rake dev:setup`
      
      [ci skip]
      
      See merge request !5559
      2080b225
    • Z
      Remove project which can't be pulled while seeding · 20a9bc93
      Z.J. van de Weg 提交于
      [ci skip]
      20a9bc93
    • S
      Merge branch 'log-project-deletion' into 'master' · 15654eca
      Stan Hu 提交于
      Add a log message when a project is scheduled for destruction for debugging
      
      We have a lot of projects that are in `pending_delete` state. It's not clear whether they were ever scheduled for destruction, or whether Sidekiq just dropped the job due to `MemoryKiller` or some other reason.
      
      Also this will provide a record of which user destroys a project.
      
      #20365 
      
      See merge request !5540
      15654eca
    • D
      Merge branch 'new-issue-by-email' into 'master' · 4a2320a7
      Douwe Maan 提交于
      Implement #3243 New Issue by email
      
      So we extend Gitlab::Email::Receiver for this new behaviour,
      however we might want to split it into another class for better
      testing it.
      
      Another issue is that, currently it's using this to parse project
      identifier:
      
          Gitlab::IncomingEmail.key_from_address
      
      Which is using:
      
          Gitlab.config.incoming_email.address
      
      for the receiver name. This is probably `reply` because it's used
      for replying to a specific issue. We might want to introduce another
      config for this, or just use `reply` instead of `incoming`.
      
      I'll prefer to introduce a new config for this, or just change
      `reply` to `incoming` because it would make sense for replying to
      there, too.
      
      The email template used in tests were copied and modified from:
      `emails/valid_reply.eml` which I hope is ok.
      
      /cc @DouweM #3243
      
      See merge request !3363
      4a2320a7
    • S
  2. 28 7月, 2016 27 次提交
  3. 27 7月, 2016 6 次提交