Commits · bac27df16c35abb2f8115d9c94edcc4ecbace1a7 · Forest Godfrey / gitlab-ce

19 May, 2016 1 commit

Squashed commit of the following: · bac27df1

authored May 19, 2016

commit 92de6309
Merge: 6c082ede 30f4dcd4
Author: James Lopez <james@jameslopez.es>
Date:   Thu May 19 13:06:34 2016 +0200

    Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import

commit 30f4dcd4
Author: James Lopez <james@jameslopez.es>
Date:   Thu May 19 13:02:57 2016 +0200

    uploads export

bac27df1

18 May, 2016 17 commits
- Merge branches 'feature/project-export-ui-experimental' and… · b05b21d2
  James Lopez authored May 18, 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
```
  b05b21d2
- fixed issue exporting builds · 6c082ede
  James Lopez authored May 18, 2016
  
  6c082ede
- updated test project file · dac1d0d8
  James Lopez authored May 18, 2016
  
  dac1d0d8
- Merge branches 'feature/project-export-ui-experimental' and… · be0c266c
  James Lopez authored May 18, 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
```
  be0c266c
- fix rubocop warning · 0de533ed
  James Lopez authored May 18, 2016
  
  0de533ed
- Merge branches 'feature/project-export' and 'feature/project-import' of… · 08f23751
  James Lopez authored May 18, 2016
```
Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
```
  08f23751
- fixed CI commits on export · a5f04ad4
  James Lopez authored May 18, 2016
  
  a5f04ad4
- Merge branches 'feature/project-export-ui-experimental' and… · 797504a8
  James Lopez authored May 18, 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
```
  797504a8
- Merge branches 'feature/project-export' and 'feature/project-import' of… · 2b0d198d
  James Lopez authored May 18, 2016
```
Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
```
  2b0d198d
- updated import export conf · 301d64b8
  James Lopez authored May 18, 2016
  
  301d64b8
- update relation factory with new models exceptions · 6956fb63
  James Lopez authored May 18, 2016
  
  6956fb63
- revert changes as builds are related to statuses which are already there · 0df21ac7
  James Lopez authored May 18, 2016
  
  0df21ac7
- added commits mapper and DB config import stuff · 4d894a7a
  James Lopez authored May 18, 2016
  
  4d894a7a
- Merge branches 'feature/project-export' and 'feature/project-import' of… · 13ab2072
  James Lopez authored May 18, 2016
```
Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
```
  13ab2072
- updated test file with DB config · ee299304
  James Lopez authored May 18, 2016
  
  ee299304
- Merge branches 'feature/project-export' and… · 0056cf04
  James Lopez authored May 18, 2016
```
Merge branches 'feature/project-export' and 'feature/project-export-ui-experimental' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
```
  0056cf04
- added DB configuration · bcda64c7
  James Lopez authored May 18, 2016
  
  bcda64c7
17 May, 2016 5 commits
- Merge branches 'feature/project-export-ui-experimental' and… · 20f1e284
  James Lopez authored May 17, 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
```
  20f1e284
- Merge branches 'feature/project-export' and 'feature/project-import' of… · 5bd3e8a8
  James Lopez authored May 17, 2016
```
Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
```
  5bd3e8a8
- fix specs · 7733f56d
  James Lopez authored May 17, 2016
  
  7733f56d
- updated routes for gitlab_projects · f48184cb
  James Lopez authored May 17, 2016
  
  f48184cb
- updated routes for gitlab_project · 07c642cb
  James Lopez authored May 17, 2016
  
  07c642cb
16 May, 2016 16 commits
- Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into… · e1ab530f
  James Lopez authored May 16, 2016
```
Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
```
  e1ab530f
- fix issue with forked MRs · 27991525
  James Lopez authored May 16, 2016
  
  27991525
- updated file import spec · 7ea68d00
  James Lopez authored May 16, 2016
  
  7ea68d00
- 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 1 commit

Merge branches 'feature/project-export-ui-experimental' and… · 9cc7dc55

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