1. 13 8月, 2016 4 次提交
    • D
      8779da45
    • R
      Merge branch 'fix-namespace-deletion' into 'master' · 11eefba8
      Robert Speicher 提交于
      Fix bug where destroying a namespace would not always destroy projects
          
      There is a race condition in DestroyGroupService now that projects are deleted asynchronously:
          
      1. User attempts to delete group
      2. DestroyGroupService iterates through all projects and schedules a Sidekiq job to delete each Project
      3. DestroyGroupService destroys the Group, leaving all its projects without a namespace
      4. Projects::DestroyService runs later but the can?(current_user,
          :remove_project) is `false` because the user no longer has permission to
          destroy projects with no namespace.
      5. This leaves the project in pending_delete state with no namespace/group.
       
      Projects without a namespace or group also adds another problem: it's not possible to destroy the container registry tags, since `container_registry_path_with_namespace` is the wrong value.
      
      The fix is to destroy the group asynchronously and run `execute` directly on Projects::DestroyService.
       
      Closes #17893
      
      See merge request !4341
      11eefba8
    • D
      Merge branch 'ruby-2-3-1' into 'master' · 7b63f828
      Douwe Maan 提交于
      Update ruby 2.3.1
      
      We where using 2.3.0, now 2.3.1
      
      cc @connorshea 
      
      See merge request !5790
      7b63f828
    • J
      Merge branch '20059-environment-list' into 'master' · 8d1c7c5d
      Jacob Schatz 提交于
      Resolve "Format branch, tag, and commit in environment list"
      
      ## What does this MR do?
      Updates Environments page rows to match the new pipeline updates
      
      ## Are there points in the code the reviewer needs to double check?
      I removed `private` from `avatars_helper.rb` so I could use `user_avatar`.
      
      ## What are the relevant issue numbers?
      Closes #20059 
      
      ## Screenshots (if relevant)
      ![Screen_Shot_2016-08-08_at_11.44.36_AM](/uploads/62fbb475a7d9cc613fe5ba1715229553/Screen_Shot_2016-08-08_at_11.44.36_AM.png)
      ![Screen_Shot_2016-08-08_at_11.44.41_AM](/uploads/ce1bd3ab62c0bc8091e9b6f85012ed36/Screen_Shot_2016-08-08_at_11.44.41_AM.png)
      
      
      
      See merge request !5687
      8d1c7c5d
  2. 12 8月, 2016 36 次提交