Skip to content
Snippets Groups Projects

Fix gitlab:import:repos Rake task moving repositories into the wrong location

Merged Stan Hu requested to merge sh-fix-import-rake-task into master
All threads resolved!

If the source import directory were different from the destination directory, GitLab would first create a blank repository and then erroneously move the original one into a subdirectory. Adding an import type prevents this the project from being initialized in the first place. It was accidentally removed in 1f917cbd.

Closes #40765 (closed)

Merge request reports

Checking pipeline status.

Approved by

Merged by James LopezJames Lopez 7 years ago (Dec 11, 2017 8:47am UTC)

Pipeline #14952281 failed

Pipeline failed for 7694ae88 on master

Test coverage 53.58% from 0 jobs

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Thanks Stan! :hearts:

  • assigned to @stanhu

  • James Lopez
  • Stan Hu added 1 commit

    added 1 commit

    • 917a112e - Simplify normalizing of paths

    Compare with previous version

  • Stan Hu added 1 commit

    added 1 commit

    • 86661a3a - Use build instead of create in importer spec

    Compare with previous version

  • Stan Hu resolved all discussions

    resolved all discussions

  • Stan Hu added 1 commit

    added 1 commit

    • f1eaab7b - Remove the need for destroy and add a comment in the spec

    Compare with previous version

  • assigned to @jameslopez

  • James Lopez approved this merge request

    approved this merge request

  • James Lopez enabled an automatic merge when the pipeline for f1eaab7b succeeds

    enabled an automatic merge when the pipeline for f1eaab7b succeeds

  • Thanks @stanhu - LGTM! :100:

    I think we can merge this :)

  • merged

  • James Lopez mentioned in commit 7694ae88

    mentioned in commit 7694ae88

  • James Lopez mentioned in commit 0f04fa28

    mentioned in commit 0f04fa28

  • Picked into https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15907, will merge into 10-3-stable ready for 10.3 RC1.

  • James Lopez mentioned in commit d463c6a9

    mentioned in commit d463c6a9

  • Picked into https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15925, will merge into 10-2-stable ready for 10.2.5

    /cc @mkozono

  • Stan Hu mentioned in issue #41149 (closed)

    mentioned in issue #41149 (closed)

  • mentioned in issue #41424 (closed)

  • James Lopez mentioned in merge request !16115 (merged)

    mentioned in merge request !16115 (merged)

  • Please register or sign in to reply
    Loading