Skip to content
Snippets Groups Projects

Absorb gitlab_git

Closed Douwe Maan requested to merge absorb-gitlab-git into master
All threads resolved!

Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/24374

I'd like to get this merged sooner rather than later, so no extra work is done on https://gitlab.com/gitlab-org/gitlab_git that would need to be backported. Right now, no cleanup or deduplication of the code has been performed; everything is left pretty much as it was so as not to disturb the beast.

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Robert Speicher
  • Robert Speicher
  • Curious to see how GitLab's RuboCop rules will react to this.

  • Douwe Maan Added 1 commit:

    Added 1 commit:

    • 23c8332f - Absorb gitlab_git @ 6b077df2b68158cf8e069e3ffd6359aff038a438

    Compare with previous version

  • @DouweM Test failures.

    I think we should rethink our strategy a bit here:

    1. Add GitLab CE's .rubocop.yml and .rubocop_todo.yml to gitlab_git and fix those violations.
    2. Update gitlab_git's specs to conform to the version of RSpec used by CE.
    3. Remove rspec-its and rspec-mocks
    4. Depending how involved it is, update specs to use programmatically-generated repository fixtures instead of the static one.
    5. Absorb.
  • Reassigned to @DouweM

  • Robert Speicher resolved all discussions

    resolved all discussions

  • Robert Speicher changed milestone to %8.16

    changed milestone to %8.16

  • I'll take this over.

  • Robert Speicher mentioned in merge request !8447 (merged)

    mentioned in merge request !8447 (merged)

  • Douwe Maan mentioned in merge request gitlab_git!134 (merged)

    mentioned in merge request gitlab_git!134 (merged)

  • Please register or sign in to reply
    Loading