Skip to content
Snippets Groups Projects

Export project functionality

Merged James Lopez requested to merge feature/project-export into master

This is a MR for the export functionality of https://gitlab.com/gitlab-org/gitlab-ce/issues/3050, which adds the ability to export single projects.

  • members
  • DB data
    • issues
    • issue comments
    • merge requests
    • merge request diff
    • merge request comments
    • labels
    • milestones
    • snippets
    • releases
    • events
    • commit statuses
    • CI builds
  • File system data
    • Git repository
    • wiki
    • uploads
    • CI build traces
    • CI build artifacts
    • LFS objects
  • DB configuration
    • services
    • web hooks
    • protected branches
    • deploy keys
    • CI variables
    • CI triggers

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
  • 1 module Gitlab
    2 module ImportExport
    3 class Shared
    • Not immediately clear to me how we're supposed to use this class. Is it for configuration that's shared between both Import and Export?

    • Author Maintainer

      It's shared between different classes in the Export. It generates an export path with a timestamp that is being reused by other methods. I think this use to have more things so maybe it's now unnecessary, I didn't delete it though as I thought I can reuse it to save some sort of state in case of error and can possibly be reused by the Import...

  • 1 class ProjectExportWorker
    2 include Sidekiq::Worker
    3
    4 # TODO: enabled retry - disabled for QA purposes
    5 sidekiq_options queue: :gitlab_shell, retry: false
    6
    7 def perform(current_user_id, project_id)
    8 current_user = User.find(current_user_id)
    9 project = Project.find(project_id)
    10 ::Projects::ImportExport::ExportService.new(project, current_user).execute
  • Author Maintainer

    @rspeicher Thanks for the review! Apologies for not paying attention to many of these things before the review as I focused on just making it work, refactor later... I'll ping you here once I make the changes.

  • James Lopez Added 1 commit:

    Added 1 commit:

    • ce598b05 - fixed and refactored a few things based on MR feedback
  • James Lopez Added 1 commit:

    Added 1 commit:

  • James Lopez Added 1 commit:

    Added 1 commit:

    • 8ac53eb5 - started refactoring import export reader - WIP
  • James Lopez Added 1 commit:

    Added 1 commit:

    • 3aee167d - fixed issues after refactor, spec passing
  • James Lopez Added 1 commit:

    Added 1 commit:

    • 9c639041 - bit more refactoring of import export reader, fixed rubocop warning
  • James Lopez Added 188 commits:

    Added 188 commits:

    • 9c639041...90ae445b - 187 commits from branch master
    • 3f87387b - Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export
  • James Lopez Added 1 commit:

    Added 1 commit:

    • 7ff2a51e - more refactoring to import export reader
  • James Lopez Added 1 commit:

    Added 1 commit:

  • James Lopez Added 2 commits:

    Added 2 commits:

    • 21be0cae - fixing merge issues
    • f3a88212 - Merge remote-tracking branch 'gitlab/feature/project-export' into feature/project-export
  • James Lopez Added 1 commit:

    Added 1 commit:

  • James Lopez Added 1 commit:

    Added 1 commit:

    • a5d59f07 - added better error handling. Also refactored some of the code and fixed a few is…
  • James Lopez Added 1 commit:

    Added 1 commit:

  • James Lopez Added 1 commit:

    Added 1 commit:

    • cffae0d2 - fixing more export problems
  • Author Maintainer

    @rspeicher feel free to review this again...

  • James Lopez Added 1 commit:

    Added 1 commit:

  • James Lopez Added 1 commit:

    Added 1 commit:

    • 8165e520 - add author on notes to export - so we can add to a note if project member is not found
  • James Lopez Unmarked this merge request as a Work In Progress

    Unmarked this merge request as a Work In Progress

  • Author Maintainer

    @rspeicher / @rymai feel free to review this and https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3142 / https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4012 again - it would be great if I can get this reviewed soon as the deadline for new features is approaching!

    Ideally I would like to get this merged soon so I can work on a few remaining things like uploads, DB config and refactor some of the code...

  • James Lopez Added 1 commit:

    Added 1 commit:

  • @rspeicher Get on this :)

  • @rspeicher Please do, thanks! :)

  • Author Maintainer

    @rspeicher thanks for reviewing this! - I've done the changes suggested, or left a comment otherwise.

  • James Lopez Added 1 commit:

    Added 1 commit:

    • f386d7a7 - some changes based on MR feedback
  • James Lopez Added 1 commit:

    Added 1 commit:

    • 5777ad9a - adding versioning to export
  • James Lopez Added 1 commit:

    Added 1 commit:

  • James Lopez Added 1 commit:

    Added 1 commit:

  • James Lopez Marked the task services as completed

    Marked the task services as completed

  • James Lopez Marked the task web hooks as completed

    Marked the task web hooks as completed

  • James Lopez Marked the task protected branches as completed

    Marked the task protected branches as completed

  • James Lopez Marked the task CI variables as completed

    Marked the task CI variables as completed

  • James Lopez Marked the task CI triggers as completed

    Marked the task CI triggers as completed

  • James Lopez Marked the task deploy keys as completed

    Marked the task deploy keys as completed

  • James Lopez Added 1 commit:

    Added 1 commit:

  • James Lopez Marked the task CI builds as completed

    Marked the task CI builds as completed

  • James Lopez Added 1 commit:

    Added 1 commit:

  • James Lopez Added 1 commit:

    Added 1 commit:

  • James Lopez Added 1 commit:

    Added 1 commit:

  • James Lopez Added 1 commit:

    Added 1 commit:

  • James Lopez Added 1 commit:

    Added 1 commit:

  • James Lopez Marked the task uploads as completed

    Marked the task uploads as completed

  • James Lopez Milestone changed to %8.9

    Milestone changed to %8.9

  • Reassigned to @rspeicher

  • Author Maintainer

    @rspeicher @rymai let's try to get this merged for 8.9! I've assigned two of the MRs to each of you as this still needs reviewing. Thanks!

    /cc @DouweM

    Edited by James Lopez
  • @jameslopez Couple more notes, but we're getting there. Really nice job. 👍

    I also want @DouweM to look at ImportExportReader since that class is still quite complex.

    Edited by Robert Speicher
  • Douwe Maan
    Douwe Maan @DouweM started a thread on the diff
  • 1 # Model relationships to be included in the project import/export
    2 project_tree:
    3 - issues:
    4 - notes:
    5 :author
    • I'm not sure about specifying the export tree in a YML file that's so far away from the actual model.

      I had something like this in mind:

      class Project
        include Exportable
      
        export :issues, :snippets #etc
      
        export_attrs only: [:name, :path] # etc
      end
      
      class Snippet
        include Exportable
        
        export :author
        export_attrs except: [:expired_at]
      end
      
      class Issue
        include Exportable
      
        export :notes
      end
      
      class Note
        include Exportable
        
        export :author
      end
      
      class User
        include Exportable
        
        export_attrs only: [:id, :email, :username, :name]
      end

      That way it's clearer when changing a model what the effect is on the export functionality.

    • Author Maintainer

      I agree, the class is a bit complex and I will have to leave some comments and probably rename things to make it clearer/cleaner.

      Now, I'm not sure I want to start again and get rid of the whole YML thing. I think it's still clear from the export if something is missing or not supported, as the tests will expect those models to exist so we will find out anyway, plus we will still have to rely on those tests anyway to catch changes to callbacks or methods called when we instantiate the models with that new approach ^^, even adding new columns, relations, etc... And I think it may still require certain level of complexity in order to generate the JSON export...

      I also like the centralised way of the YML file, where we can see what is actually exported and the relationships between the models in one place, plus in the future it has room to dynamically select the models we want, or adding new ones fairly easily, even on-the-fly.

      Also, if we want to release this on 8.9 I still have to redo the whole UI MR 😆 😢 haha. That said, if you have a strong opinion about changing it, it's not a big deal and I can change it to follow your suggestion...

      Edited by James Lopez
    • @jameslopez I agree that there's a benefit to having the structure of the export file in one place. Let's keep it this way :) If you need help on the UI/flow, ping @jschatz1!

    • Author Maintainer

      thanks @DouweM, I was gonna add more comments in that MR as well. I will get back to this MR once I'm done with the big refactoring there 👍

  • James Lopez Added 1 commit:

    Added 1 commit:

    • 3e991230 - Fix merge conflicts - squashed commit
  • James Lopez Added 1 commit:

    Added 1 commit:

    • 721014c9 - Revert "Fix merge conflicts - squashed commit"
  • James Lopez Added 1143 commits:

    Added 1143 commits:

  • James Lopez Added 1 commit:

    Added 1 commit:

    • 9d0038f2 - started refactoring a bunch of stuff based on feedback
  • James Lopez Added 1 commit:

    Added 1 commit:

    • 8476f91a - WIP - added missing notes, trying to fix specs
  • James Lopez Added 675 commits:

    Added 675 commits:

    • 8476f91a...06a99cf7 - 674 commits from branch master
    • e2c95c07 - Merge branches 'feature/project-export' and 'master' of gitlab.com:gitlab-org/gi…
  • James Lopez Added 1 commit:

    Added 1 commit:

    • 771f7351 - few more modifications based on comments
  • James Lopez Added 1 commit:

    Added 1 commit:

    • 069bc264 - refactored loads of things due to commits to pipeline change
  • James Lopez Added 1 commit:

    Added 1 commit:

    • cc322603 - added comments to import export reader class
  • @rspeicher Can you review this again?

  • James Lopez Added 1 commit:

    Added 1 commit:

  • James Lopez Added 1 commit:

    Added 1 commit:

  • 1 module Gitlab
    2 module ImportExport
    3 class RepoSaver
    4 include Gitlab::ImportExport::CommandLineUtil
    5
    6 attr_reader :full_path
    7
    8 def initialize(project:, shared:)
    9 @project = project
    10 @shared = shared
    11 end
    12
    13 def save
    14 return false if @project.empty_repo?
  • @jameslopez I'm still concerned about Reader (nee ImportExportReader). For how complex it appears, its unit test looks very sparse. I'm wondering if we should have more lower-level unit tests for it, either by abusing send to spec private methods, or just making them public.

    Edited by Robert Speicher
  • Reassigned to @jameslopez

  • Author Maintainer

    @rspeicher thanks for reviewing this again. I will check the spec and see if I can add more things. Not a fan of making private methods public for testing purposes though, I also think they should be well covered with good testing. The current test is a bit crap as there are some scenarios missing. Also, I think the current spec is covering quite a few things in one go, perhaps breaking it down and add all scenarios would help.

    i.e testing a single relations, then an array of relations, then sub relations, then including/excluding attributes, etc etc...

  • James Lopez Added 1 commit:

    Added 1 commit:

    • 4020b0f5 - few changes based on MR feedback
  • James Lopez Added 1 commit:

    Added 1 commit:

  • James Lopez Added 1 commit:

    Added 1 commit:

  • Author Maintainer

    @rspeicher I've done the changes suggested and added a better rspec for the Reader- feel free to review again. Thanks!

  • Reassigned to @rspeicher

  • James Lopez Added 1 commit:

    Added 1 commit:

  • @jameslopez I think we're good. Can we rebase/squash? Also, do we need to merge your 3 MRs in a specific order?

  • James Lopez Added 1 commit:

    Added 1 commit:

    • 13e37a3e - squashed merge and fixed conflicts
  • James Lopez Added 1 commit:

    Added 1 commit:

    • 452c076a - Revert "squashed merge and fixed conflicts"
  • James Lopez Added 440 commits:

    Added 440 commits:

    • 452c076a...c369cc8b - 439 commits from branch master
    • 778d7266 - Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export
  • Douwe Maan mentioned in commit 8891bef2

    mentioned in commit 8891bef2

  • Douwe Maan Added 237 commits:

    Added 237 commits:

    • 2dc2ce45 - WIP - broken spec and some import stuff so I can create a MR on this.
    • 2cc6aaec - WIP (broken) - playing with import stuff
    • f0ce83b1 - modify model creation to use services when they are available
    • 40de1b46 - revert back services changes
    • e90b1e14 - refactored project creation to create the associations as well
    • 2a7a1bcc - refactored methods in project tree restorer
    • af9b4823 - Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
    • febff153 - started mapping members
    • 3f479edd - Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
    • c2304141 - Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.c…
    • b7149266 - WIP project members - json not quite right yet
    • e45c2bf8 - Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.c…
    • cbae4038 - updated test json
    • 7b855b75 - project members import stuff
    • 18d3b38e - project members: fixed a few issues. Specs now passing
    • b92411a0 - Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
    • 1d8e02c4 - solved a bunch of issues with mapping members/users
    • 76efdea7 - fixing MR issues with import
    • 3a131383 - fixed MR issue and refactored some stuff
    • 37c68fe0 - don't create MR diff as this can be imported presumably
    • 25e078c1 - Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.c…
    • a59ba217 - WIP - building up import tree with sub relations, etc
    • e17c7f41 - add TODO
    • b0f34fb0 - Merge branches 'feature/project-import' and 'master' of gitlab.com:gitlab-org/gi…
    • d29c816d - Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
    • a28be02e - starting to use the new dynamic stuff on the import
    • 56fc5893 - more refactoring to use dynamic import
    • da60baf2 - fixing more importing issues
    • dbf755ae - small fix
    • 4ffcd427 - import working!
    • eb55cb92 - more refactoring
    • 49539779 - fix spec
    • c94c0dc0 - Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
    • 0d8a97dc - some more fixes to import projects
    • 36ba23d1 - Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
    • 267fd01c - fixed import and spec is now passing!
    • adbcccb4 - Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
    • 97c3aff1 - refactored import stuff, moved to lib
    • 41163fd5 - some experimental UI stuff to test export
    • 05edd5e6 - download export now working
    • ae777ea0 - WIP - importing file and repo
    • 7614d230 - fix conflicts
    • 45032bf4 - Merge branch 'feature/project-export' into feature/project-import
    • 8f973b8f - more refactoring - easier guessing path changes
    • a0ede57d - Merge branches 'feature/project-export' and 'feature/project-import' into featur…
    • b18bd9c8 - Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
    • acf29795 - gitlab import UI - icon, file selector, etc... Also updated font-awesome and mod…
    • e5a59331 - remove debug statement
    • 10f16095 - changes to be picked by the UI branch
    • 22ff009a - Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
    • 4037a738 - Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into fe…
    • 28b0208e - refactoring, mainly UI stuff to follow other import actions
    • 1d4c3fa1 - more refactoring, now using custom job for processing project imports
    • cbbc42e0 - adding more UI changes, updated controller, worker and refactored import service
    • 34c826a3 - some JS magic to pass namespace and path importing projects
    • cec4ae55 - quite a few fixes - import service
    • 5908bdf3 - fixing a few tar issues - and using gnu tar only
    • c5bc2629 - few fixes - import from UI working
    • c46f3bcb - few fixes and new integration spec -WIP
    • 7ebf22e0 - more refactoring and fixes - fixing spec as well
    • 07ab6c2e - refactoring and fixing a bunch of stuff
    • b5f2a7e1 - fixed integration test
    • 5a4f5763 - fixing issues with project members mapping. Also added some more JS magic to the import page
    • 548c91e3 - Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
    • 9d306eb1 - picking stuff from ui related to import
    • 6139e143 - fixing some rubucop warnings
    • e172028a - Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.c…
    • 3929972d - Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into fe…
    • 315195fe - fix schema file
    • fc329696 - typo
    • b69c8c28 - fixing some export issues in spec
    • 17cfce7a - typo
    • bd2ebf37 - use worker in controller
    • 9b212073 - updated import worker
    • 1ff77359 - Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
    • 6cf88ce4 - Merge branches 'feature/project-export-ui-experimental' and 'feature/project-imp…
    • e5ee7e86 - typos in export page
    • 14dd2d4a - fixed import file spec
    • 84c7b518 - Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.c…
    • a4d242b8 - refactored some namespace stuff and fixed project tree restorer spec. also remov…
    • 7a531bb1 - Merge branches 'feature/project-export-ui-experimental' and 'feature/project-imp…
    • 48fcf540 - add gitlab project controller - still WIP
    • c1858da9 - remove spec helper conf
    • c422cef0 - Merge branches 'feature/project-export-ui-experimental' and 'feature/project-imp…
    • a9ac9ed1 - fix import feature
    • e14d1051 - fix import feature v2
    • 43488d27 - Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.c…
    • 92f4bde4 - use git bundle in import and add wiki repo to import
    • 21cfad24 - Merge branches 'feature/project-export-ui-experimental' and 'feature/project-imp…
    • 7204018a - fix path to bundle
    • 65e0d378 - Merge branches 'feature/project-export-ui-experimental' and 'feature/project-imp…
    • 4b1fdfd6 - updated export file for testing
    • 28ba2176 - fix issue restoring repo
    • 4c0f9a54 - Merge branches 'feature/project-export-ui-experimental' and 'feature/project-imp…
    • f11920e2 - more fixes - restoring repo
    • 99a5d07c - Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into fe…
    • 9c60eca8 - fix wiki import
    • f927e728 - Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into fe…
    • 2a135866 - added more tests to integration spec
    • 9f5dd2de - handling errors a bit better on import failure
    • 63df9b57 - Merge branches 'feature/project-export-ui-experimental' and 'feature/project-imp…
    • 4290e9c8 - Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.c…
    • 49cdb778 - few fixes to import specs and code
    • 7750764a - Merge branches 'feature/project-export-ui-experimental' and 'feature/project-imp…
    • 47cd14b5 - Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
    • 6fe8b5da - Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into fe…
    • bd0c8ce4 - fixed space
    • d607046d - fix merge conflicts
    • 5b51d13c - removed method no longer needed
    • e6fcd6d5 - fixed more import merging issues
    • 278be18c - Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into fe…
    • 17ce63a5 - updated spec export file
    • 6fa529e9 - Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.c…
    • df6483c6 - Merge branches 'feature/project-export-ui-experimental' and 'feature/project-imp…
    • 5086e899 - fix log statement
    • a86da1b7 - Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
    • d4ab068e - Merge branches 'feature/project-export-ui-experimental' and 'feature/project-imp…
    • 27867f35 - Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.c…
    • 0d83b908 - Merge branches 'feature/project-export-ui-experimental' and 'feature/project-imp…
    • ae538407 - updated export file for spec
    • a61456e4 - refactored import to use shared error stuff and fixed a few issues with recent refactorings
    • 7a80880f - Merge branches 'feature/project-export-ui-experimental' and 'feature/project-imp…
    • 385d6df2 - typo
    • 2a70d963 - Merge branches 'feature/project-export-ui-experimental' and 'feature/project-imp…
    • f06c5516 - fix issue in import_service
    • 350022ff - Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into fe…
    • ff56f7be - fix importer issue
    • f6c9883d - Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into fe…
    • 3b7e5df8 - Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.c…
    • 78cd39e4 - Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.c…
    • 25a1c654 - add message to notes about missing author on import
    • ffa71b6a - Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into fe…
    • a8682582 - update json and fix notes issue
    • 27913353 - Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into fe…
    • c487e6d3 - updated spec file
    • 1eb802cd - fixed leaving comments on notes about missing authors
    • 5355589c - Merge branches 'feature/project-export-ui-experimental' and 'feature/project-imp…
    • 8c508037 - updated controllers with permissions check
    • 89fb5df5 - updated routes file
    • 1ee19f04 - fixed permissions
    • 2e1decd0 - restricted actual member mapping to admins
    • 0bacae0f - Merge branches 'feature/project-export-ui-experimental' and 'feature/project-imp…
    • 41f9d9d9 - Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
    • 2cc5b1f1 - Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into fe…
    • bf81c588 - fix issue with mapping members
    • 13d64e7e - Merge branches 'feature/project-export-ui-experimental' and 'feature/project-imp…
    • 220e55a9 - fix spec
    • 9cc7dc55 - Merge branches 'feature/project-export-ui-experimental' and 'feature/project-imp…
    • 834c9537 - fix merge conflicts
    • 30aa37c8 - remove spec change
    • 3c3559cf - Merge branches 'feature/project-export-ui-experimental' and 'feature/project-imp…
    • 8c478874 - Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.c…
    • 51487575 - added version check on import
    • c3747003 - missing new line
    • 6930f9a9 - Merge branches 'feature/project-export-ui-experimental' and 'feature/project-imp…
    • 360689bb - fix version
    • bd5b019a - Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.c…
    • 155d02c8 - Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into fe…
    • 7ea68d00 - updated file import spec
    • 27991525 - fix issue with forked MRs
    • e1ab530f - Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into fe…
    • 07c642cb - updated routes for gitlab_project
    • f48184cb - updated routes for gitlab_projects
    • 5bd3e8a8 - Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.c…
    • 20f1e284 - Merge branches 'feature/project-export-ui-experimental' and 'feature/project-imp…
    • 0056cf04 - Merge branches 'feature/project-export' and 'feature/project-export-ui-experimen…
    • ee299304 - updated test file with DB config
    • 13ab2072 - Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.c…
    • 4d894a7a - added commits mapper and DB config import stuff
    • 0df21ac7 - revert changes as builds are related to statuses which are already there
    • 6956fb63 - update relation factory with new models exceptions
    • 2b0d198d - Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.c…
    • 797504a8 - Merge branches 'feature/project-export-ui-experimental' and 'feature/project-imp…
    • 08f23751 - Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.c…
    • 0de533ed - fix rubocop warning
    • be0c266c - Merge branches 'feature/project-export-ui-experimental' and 'feature/project-imp…
    • dac1d0d8 - updated test project file
    • 6c082ede - fixed issue exporting builds
    • b05b21d2 - Merge branches 'feature/project-export-ui-experimental' and 'feature/project-imp…
    • 92de6309 - Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.c…
    • bac27df1 - Squashed commit of the following:
    • 14669977 - import uploads. Fixed a few things to do with members, triggers, etc...
    • 9d861db5 - Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.c…
    • 38b92fe8 - Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
    • 24d56853 - fix merge conflicts
    • becd9bfd - updated spec file
    • dd86c91c - fixed small issue mapping members
    • 6782cd3c - fix extra space
    • 56b2f5e0 - Merge branches 'feature/project-export-ui-experimental' and 'feature/project-imp…
    • fa188469 - a few nice to have and updated changelog
    • f70c0009 - fix indentation
    • 7c8359b7 - started refactoring some stuff based on MR feedback
    • 102074c8 - more and more refactoring
    • a9fdf62b - refactoring relation factory, changed from module to class
    • 41c06c31 - refactoring more things based on MR feedback
    • ad68bc63 - Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.c…
    • b07dc938 - fixed specs and refactored a few things due to recent model changes and merge conflicts
    • 6f0c5033 - Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.c…
    • e83fc684 - Merge branches 'feature/project-export-ui-experimental' and 'feature/project-imp…
    • d6adfe04 - fix gemfile
    • e5cf4cd7 - corrected a few warnings
    • c23aaf13 - Merge branches 'feature/project-export-ui-experimental' and 'feature/project-imp…
    • f4d762d7 - addressing MR feedback, few changes to members mapper
    • 833dc320 - few more changes based on feedback
    • 9fd35740 - refactored notes logic
    • f449eeb6 - Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into fe…
    • 903da377 - WIP - starting refactoring import/export to use services
    • 9ff19904 - Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.c…
    • 77794579 - fix merge
    • 279412f9 - updated relation_factory based on MR feedback
    • 1ea44ee7 - Merge branches 'feature/project-export-ui-experimental' and 'feature/project-imp…
    • 3f7ed550 - lots of refactoring to reuse import service
    • fe370b1c - new export stuff and view
    • 9ecebaae - adding notifications stuff and more refactoring for exporting projects
    • 862b359b - fix merge issue
    • 1d4243f5 - Merge branches 'feature/project-export-ui-experimental' and 'feature/project-imp…
    • b53ed848 - adapted current services stuff to use new project import, plus fixes a few issue…
    • ff44198e - few fixes after refactoring the whole UI stuff
    • fc5f6943 - yay finally importing working with the new services structure
    • dee6fba5 - get rid of old worker
    • 36ccaca3 - project export archiver
    • bacd2c4f - some refactoring - renaming things, etc..
    • 6755cb3a - fix changelog
    • 89227126 - enable retry on worker
    • 7019a19b - cleanup namespace check now done by service
    • cbd0201f - fixing specs and some code cleanup
    • f6896f93 - fix annoying spec
    • 4bde5934 - lots of refactoring again based on feedback. Changed the UI slightly and also fixed a small bug
    • 5087e10f - fix specs
    • 1b8a1073 - fix wiki stuff
    • 8ac52f49 - fix spinach test
    • 2a747d38 - fixed merge conflicts
    • b3a0a1c3 - fixed merge conflicts on UI branch
    • bfced6fd - fixed changelog - [ci skip]
    • 2d4556c5 - a few changes based on MR feedback
    • 402b651a - Merge branch 'feature/project-export-ui-experimental' into 'feature/project-import'
    • 8891bef2 - Merge branch 'feature/project-import' into 'feature/project-export'
  • Douwe Maan Enabled an automatic merge when the build for 8891bef2 succeeds

    Enabled an automatic merge when the build for 8891bef2 succeeds

  • Douwe Maan Status changed to merged

    Status changed to merged

  • Douwe Maan mentioned in commit 9b7fd748

    mentioned in commit 9b7fd748

  • James Lopez Added ~149423 label

    Added ~149423 label

  • Robert Speicher Removed ~149423 label

    Removed ~149423 label

  • Picked into 8-9-stable, will be in RC7.

  • mentioned in issue #33604 (moved)

  • Please register or sign in to reply
    Loading