Commits · 2a135866a24170e1db106885d4134e33141c07dd · Boxiang Sun / gitlab-ce

05 May, 2016 18 commits
- added more tests to integration spec · 2a135866
  James Lopez authored May 05, 2016
  
  2a135866
- Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into... · f927e728
  James Lopez authored May 05, 2016
```
Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
```
  f927e728
- fix wiki import · 9c60eca8
  James Lopez authored May 05, 2016
  
  9c60eca8
- Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into... · 99a5d07c
  James Lopez authored May 05, 2016
```
Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
```
  99a5d07c
- more fixes - restoring repo · f11920e2
  James Lopez authored May 05, 2016
  
  f11920e2
- Merge branches 'feature/project-export-ui-experimental' and... · 4c0f9a54
  James Lopez authored May 05, 2016
```
Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
```
  4c0f9a54
- fix issue restoring repo · 28ba2176
  James Lopez authored May 05, 2016
  
  28ba2176
- updated export file for testing · 4b1fdfd6
  James Lopez authored May 05, 2016
  
  4b1fdfd6
- Merge branches 'feature/project-export-ui-experimental' and... · 65e0d378
  James Lopez authored May 05, 2016
```
Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
```
  65e0d378
- fix path to bundle · 7204018a
  James Lopez authored May 05, 2016
  
  7204018a
- Merge branches 'feature/project-export-ui-experimental' and... · 21cfad24
  James Lopez authored May 05, 2016
```
Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
```
  21cfad24
- use git bundle in import and add wiki repo to import · 92f4bde4
  James Lopez authored May 05, 2016
  
  92f4bde4
- Merge branches 'feature/project-export' and 'feature/project-import' of... · 43488d27
  James Lopez authored May 05, 2016
```
Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
```
  43488d27
- update repo and wiki repo bundler to use git bundle instead of compressing via tar · 6612ca09
  James Lopez authored May 05, 2016
  
  6612ca09
- fix import feature v2 · e14d1051
  James Lopez authored May 05, 2016
  
  e14d1051
- fix import feature · a9ac9ed1
  James Lopez authored May 05, 2016
  
  a9ac9ed1
- Merge branches 'feature/project-export-ui-experimental' and... · c422cef0
  James Lopez authored May 05, 2016
```
Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
```
  c422cef0
- remove spec helper conf · c1858da9
  James Lopez authored May 05, 2016
  
  c1858da9
04 May, 2016 12 commits
- add gitlab project controller - still WIP · 48fcf540
  James Lopez authored May 04, 2016
  
  48fcf540
- Merge branches 'feature/project-export-ui-experimental' and... · 7a531bb1
  James Lopez authored May 04, 2016
```
Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
```
  7a531bb1
- refactored some namespace stuff and fixed project tree restorer spec. also... · a4d242b8
  James Lopez authored May 04, 2016
```
refactored some namespace stuff and fixed project tree restorer spec. also removing controller so that it belongs to the UI MR
```
  a4d242b8
- Merge branches 'feature/project-export' and 'feature/project-import' of... · 84c7b518
  James Lopez authored May 04, 2016
```
Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
```
  84c7b518
- fixed import export reader spec · 773c39cc
  James Lopez authored May 04, 2016
  
  773c39cc
- fixed import file spec · 14dd2d4a
  James Lopez authored May 04, 2016
  
  14dd2d4a
- typos in export page · e5ee7e86
  James Lopez authored May 04, 2016
  
  e5ee7e86
- Merge branches 'feature/project-export-ui-experimental' and... · 6cf88ce4
  James Lopez authored May 04, 2016
```
Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
```
  6cf88ce4
- Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into... · 1ff77359
  James Lopez authored May 04, 2016
```
Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
```
  1ff77359
- updated import worker · 9b212073
  James Lopez authored May 04, 2016
  
  9b212073
- add export worker to process project export async · bc8eebf0
  James Lopez authored May 04, 2016
  
  bc8eebf0
- use worker in controller · bd2ebf37
  James Lopez authored May 04, 2016
  
  bd2ebf37
03 May, 2016 10 commits
- typo · 17cfce7a
  James Lopez authored May 03, 2016
  
  17cfce7a
- fixing some export issues in spec · b69c8c28
  James Lopez authored May 03, 2016
  
  b69c8c28
- typo · fc329696
  James Lopez authored May 03, 2016
  
  fc329696
- fix schema file · 315195fe
  James Lopez authored May 03, 2016
  
  315195fe
- Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into... · 3929972d
  James Lopez authored May 03, 2016
```
Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental

# Conflicts:
#	app/controllers/import/gitlab_project_controller.rb
```
  3929972d
- Merge branches 'feature/project-export' and 'feature/project-import' of... · e172028a
  James Lopez authored May 03, 2016
```
Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
```
  e172028a
- fixed warning · 1990616a
  James Lopez authored May 03, 2016
  
  1990616a
- fixing some rubucop warnings · 6139e143
  James Lopez authored May 03, 2016
  
  6139e143
- picking stuff from ui related to import · 9d306eb1
  James Lopez authored May 03, 2016
  
  9d306eb1
- Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into... · 548c91e3
  James Lopez authored May 03, 2016
```
Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import

# Conflicts:
#	lib/gitlab/import_export/command_line_util.rb
```
  548c91e3