Commits · c374700390ad0e3ab8a7ad954ee1b6e311a48129 · Tatuya Kamada / gitlab-ce

16 May, 2016 7 commits
- missing new line · c3747003
  James Lopez authored May 16, 2016
  
  c3747003
- added version check on import · 51487575
  James Lopez authored May 16, 2016
  
  51487575
- Merge branches 'feature/project-export' and 'feature/project-import' of... · 8c478874
  James Lopez authored May 16, 2016
```
Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
```
  8c478874
- adding versioning to export · 5777ad9a
  James Lopez authored May 16, 2016
  
  5777ad9a
- remove spec change · 30aa37c8
  James Lopez authored May 16, 2016
  
  30aa37c8
- fix merge conflicts · 834c9537
  James Lopez authored May 16, 2016
  
  834c9537
- some changes based on MR feedback · f386d7a7
  James Lopez authored May 16, 2016
  
  f386d7a7
13 May, 2016 8 commits
- fix spec · 220e55a9
  James Lopez authored May 13, 2016
  
  220e55a9
- fix issue with mapping members · bf81c588
  James Lopez authored May 13, 2016
  
  bf81c588
- Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into... · 41f9d9d9
  James Lopez authored May 13, 2016
```
Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
```
  41f9d9d9
- fixed TODOs left · 2dff04f2
  James Lopez authored May 13, 2016
  
  2dff04f2
- restricted actual member mapping to admins · 2e1decd0
  James Lopez authored May 13, 2016
  
  2e1decd0
- fixed leaving comments on notes about missing authors · 1eb802cd
  James Lopez authored May 13, 2016
  
  1eb802cd
- update json and fix notes issue · a8682582
  James Lopez authored May 13, 2016
  
  a8682582
- add message to notes about missing author on import · 25a1c654
  James Lopez authored May 13, 2016
  
  25a1c654
12 May, 2016 7 commits
- Merge branches 'feature/project-export' and 'feature/project-import' of... · 78cd39e4
  James Lopez authored May 12, 2016
```
Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
```
  78cd39e4
- add author on notes to export - so we can add to a note if project member is not found · 8165e520
  James Lopez authored May 12, 2016
  
  8165e520
- Merge branches 'feature/project-export' and 'feature/project-import' of... · 3b7e5df8
  James Lopez authored May 12, 2016
```
Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
```
  3b7e5df8
- fix rubocop warnings · b2b7b38c
  James Lopez authored May 12, 2016
  
  b2b7b38c
- fix importer issue · ff56f7be
  James Lopez authored May 12, 2016
  
  ff56f7be
- fix issue in import_service · f06c5516
  James Lopez authored May 12, 2016
  
  f06c5516
- typo · 385d6df2
  James Lopez authored May 12, 2016
  
  385d6df2
11 May, 2016 6 commits
- refactored import to use shared error stuff and fixed a few issues with recent refactorings · a61456e4
  James Lopez authored May 11, 2016
  
  a61456e4
- Merge branches 'feature/project-export' and 'feature/project-import' of... · 27867f35
  James Lopez authored May 11, 2016
```
Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
```
  27867f35
- fixing more export problems · cffae0d2
  James Lopez authored May 11, 2016
  
  cffae0d2
- Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into... · a86da1b7
  James Lopez authored May 11, 2016
```
Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
```
  a86da1b7
- fix log statement · 5086e899
  James Lopez authored May 11, 2016
  
  5086e899
- fix bad refactor · 49e6fc40
  James Lopez authored May 11, 2016
  
  49e6fc40
10 May, 2016 5 commits
- Merge branches 'feature/project-export' and 'feature/project-import' of... · 6fa529e9
  James Lopez authored May 10, 2016
```
Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
```
  6fa529e9
- added better error handling. Also refactored some of the code and fixed a few... · a5d59f07
  James Lopez authored May 10, 2016
```
added better error handling. Also refactored some of the code and fixed a few issues in project_tree_saver
```
  a5d59f07
- fixed more import merging issues · e6fcd6d5
  James Lopez authored May 10, 2016
  
  e6fcd6d5
- removed method no longer needed · 5b51d13c
  James Lopez authored May 10, 2016
  
  5b51d13c
- fix merge conflicts · d607046d
  James Lopez authored May 10, 2016
  
  d607046d
09 May, 2016 7 commits
- renaming variable · 6a12ff63
  James Lopez authored May 09, 2016
  
  6a12ff63
- Merge remote-tracking branch 'gitlab/feature/project-export' into feature/project-export · f3a88212
  James Lopez authored May 09, 2016
  
  f3a88212
- fixing merge issues · 21be0cae
  James Lopez authored May 09, 2016
  
  21be0cae
- new line missing · 5dad9f1f
  James Lopez authored May 09, 2016
  
  5dad9f1f
- Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into... · 47cd14b5
  James Lopez authored May 09, 2016
```
Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
```
  47cd14b5
- more refactoring to import export reader · 7ff2a51e
  James Lopez authored May 09, 2016
  
  7ff2a51e
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export · 3f87387b
  James Lopez authored May 09, 2016
```
# Conflicts:
#	app/models/project.rb
```
  3f87387b