Commits · 155d02c8d7fafa91c2cbc51920d23cbd5e52cdc7 · Forest Godfrey / gitlab-ce

16 May, 2016 13 commits
- Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into… · 155d02c8
  James Lopez authored May 16, 2016
```
Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
```
  155d02c8
- Merge branches 'feature/project-export' and 'feature/project-import' of… · bd5b019a
  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
```
  bd5b019a
- fix version issue · 504c186f
  James Lopez authored May 16, 2016
  
  504c186f
- fix version · 360689bb
  James Lopez authored May 16, 2016
  
  360689bb
- Merge branches 'feature/project-export-ui-experimental' and… · 6930f9a9
  James Lopez authored May 16, 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
```
  6930f9a9
- 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
- Merge branches 'feature/project-export-ui-experimental' and… · 3c3559cf
  James Lopez authored May 16, 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
```
  3c3559cf
- 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 19 commits
- Merge branches 'feature/project-export-ui-experimental' and… · 9cc7dc55
  James Lopez authored May 13, 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
```
  9cc7dc55
- fix spec · 220e55a9
  James Lopez authored May 13, 2016
  
  220e55a9
- Merge branches 'feature/project-export-ui-experimental' and… · 13d64e7e
  James Lopez authored May 13, 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
```
  13d64e7e
- fix issue with mapping members · bf81c588
  James Lopez authored May 13, 2016
  
  bf81c588
- Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into… · 2cc5b1f1
  James Lopez authored May 13, 2016
```
Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
```
  2cc5b1f1
- 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
- Merge branches 'feature/project-export-ui-experimental' and… · 0bacae0f
  James Lopez authored May 13, 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
```
  0bacae0f
- restricted actual member mapping to admins · 2e1decd0
  James Lopez authored May 13, 2016
  
  2e1decd0
- fixed permissions · 1ee19f04
  James Lopez authored May 13, 2016
  
  1ee19f04
- updated routes file · 89fb5df5
  James Lopez authored May 13, 2016
  
  89fb5df5
- updated controllers with permissions check · 8c508037
  James Lopez authored May 13, 2016
  
  8c508037
- Merge branches 'feature/project-export-ui-experimental' and… · 5355589c
  James Lopez authored May 13, 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
```
  5355589c
- fixed leaving comments on notes about missing authors · 1eb802cd
  James Lopez authored May 13, 2016
  
  1eb802cd
- updated spec file · c487e6d3
  James Lopez authored May 13, 2016
  
  c487e6d3
- Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into… · 27913353
  James Lopez authored May 13, 2016
```
Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
```
  27913353
- update json and fix notes issue · a8682582
  James Lopez authored May 13, 2016
  
  a8682582
- Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into… · ffa71b6a
  James Lopez authored May 13, 2016
```
Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
```
  ffa71b6a
- add message to notes about missing author on import · 25a1c654
  James Lopez authored May 13, 2016
  
  25a1c654
12 May, 2016 8 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
- Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into… · f6c9883d
  James Lopez authored May 12, 2016
```
Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
```
  f6c9883d
- fix importer issue · ff56f7be
  James Lopez authored May 12, 2016
  
  ff56f7be
- Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into… · 350022ff
  James Lopez authored May 12, 2016
```
Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
```
  350022ff
- fix issue in import_service · f06c5516
  James Lopez authored May 12, 2016
  
  f06c5516