1. 16 May, 2018 4 commits
    • Jan Provaznik's avatar
      Delete remote uploads · cfbaa619
      Jan Provaznik authored
      ObjectStore uploader requires presence of associated `uploads` record
      when deleting the upload file (through the carrierwave's after_commit
      hook) because we keep info whether file is LOCAL or REMOTE in `upload`
      object.
      
      For this reason we can not destroy uploads as "dependent: :destroy" hook
      because these would be deleted too soon. Instead we rely on
      carrierwave's hook to destroy `uploads` in after_commit hook.
      
      But in before_destroy hook we still have to delete not-mounted uploads
      (which don't use carrierwave's destroy hook). This has to be done in
      before_Destroy instead of after_commit because `FileUpload` requires
      existence of model's object on destroy action.
      
      This is not ideal state of things, in a next step we should investigate
      how to unify model dependencies so we can use same workflow for all
      uploads.
      
      Related to #45425
      cfbaa619
    • Robert Speicher's avatar
      Merge branch '5943_improve_license_management_tests' into 'master' · aad0df7e
      Robert Speicher authored
      5943 improve license management tests
      
      Closes #5943
      
      See merge request gitlab-org/gitlab-ee!5718
      aad0df7e
    • Gilbert Roulot's avatar
      5943 improve license management tests · b7a58d83
      Gilbert Roulot authored
      b7a58d83
    • Stan Hu's avatar
      Merge branch 'ce-to-ee-2018-05-15' into 'master' · b40594d5
      Stan Hu authored
      CE upstream - 2018-05-15 09:46 UTC
      
      See merge request gitlab-org/gitlab-ee!5711
      b40594d5
  2. 15 May, 2018 36 commits