Commits · 2cc5b1f166d336036d3f1c43e183e16009be77d6 · Forest Godfrey / gitlab-ce

13 May, 2016 15 commits
- 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 10 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
- Merge branches 'feature/project-export-ui-experimental' and… · 2a70d963
  James Lopez authored May 12, 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
```
  2a70d963
- typo · 385d6df2
  James Lopez authored May 12, 2016
  
  385d6df2
11 May, 2016 10 commits
- Merge branches 'feature/project-export-ui-experimental' and… · 7a80880f
  James Lopez authored May 11, 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
```
  7a80880f
- refactored import to use shared error stuff and fixed a few issues with recent refactorings · a61456e4
  James Lopez authored May 11, 2016
  
  a61456e4
- updated export file for spec · ae538407
  James Lopez authored May 11, 2016
  
  ae538407
- Merge branches 'feature/project-export-ui-experimental' and… · 0d83b908
  James Lopez authored May 11, 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
```
  0d83b908
- 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 branches 'feature/project-export-ui-experimental' and… · d4ab068e
  James Lopez authored May 11, 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
```
  d4ab068e
- 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-ui-experimental' and… · df6483c6
  James Lopez authored May 10, 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
```
  df6483c6
- 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
- updated spec export file · 17ce63a5
  James Lopez authored May 10, 2016
  
  17ce63a5
- Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into… · 278be18c
  James Lopez authored May 10, 2016
```
Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
```
  278be18c