Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | * | | | | | | | merge hell | James Lopez | 2016-06-03 | 34 | -233/+570 | |
| | | |\ \ \ \ \ \ \ | | | | | |_|_|/ / / | | | | |/| | | | | | ||||||
| | | * | | | | | | | Revert "Fix merge conflicts - squashed commit" | James Lopez | 2016-06-03 | 34 | -570/+233 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3e99123095b26988de67a94b0e7a5207c1ef5ae2. | |||||
| | | * | | | | | | | Fix merge conflicts - squashed commit | James Lopez | 2016-06-03 | 34 | -233/+570 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/project.rb | |||||
| | | * | | | | | | | updated uploads saver | James Lopez | 2016-05-19 | 1 | -3/+8 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | fix path | James Lopez | 2016-05-19 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | refactoring more things based on MR feedback | James Lopez | 2016-06-02 | 4 | -7/+13 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | refactoring relation factory, changed from module to class | James Lopez | 2016-06-02 | 2 | -58/+72 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | more and more refactoring | James Lopez | 2016-06-02 | 6 | -46/+41 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | started refactoring some stuff based on MR feedback | James Lopez | 2016-06-01 | 4 | -49/+37 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | a few nice to have and updated changelog | James Lopez | 2016-05-20 | 1 | -0/+13 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge branches 'feature/project-export-ui-experimental' and ↵ | James Lopez | 2016-05-19 | 2 | -5/+3 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental | |||||
| | * | | | | | | | | fix extra space | James Lopez | 2016-05-19 | 1 | -1/+0 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | fixed small issue mapping members | James Lopez | 2016-05-19 | 2 | -4/+3 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | fix merge conflicts | James Lopez | 2016-05-19 | 6 | -8/+48 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | ||||||
| | * | | | | | | | | import uploads. Fixed a few things to do with members, triggers, etc... | James Lopez | 2016-05-19 | 6 | -8/+48 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' of ↵ | James Lopez | 2016-05-19 | 1 | -0/+35 | |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into feature/project-import | |||||
| | | * | | | | | | | uploads export | James Lopez | 2016-05-19 | 1 | -0/+35 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Squashed commit of the following: | James Lopez | 2016-05-19 | 1 | -0/+35 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 92de6309e1c918a4ae023641dc42b196b3fb25ea Merge: 6c082ed 30f4dcd 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 30f4dcd4c906a71db98833075c76eb59922f5b98 Author: James Lopez <james@jameslopez.es> Date: Thu May 19 13:02:57 2016 +0200 uploads export | |||||
| * | | | | | | | | | Merge branches 'feature/project-export-ui-experimental' and ↵ | James Lopez | 2016-05-18 | 1 | -1/+14 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental | |||||
| | * | | | | | | | | fixed issue exporting builds | James Lopez | 2016-05-18 | 1 | -1/+14 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge branches 'feature/project-export-ui-experimental' and ↵ | James Lopez | 2016-05-18 | 4 | -5/+15 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental | |||||
| | * | | | | | | | | fix rubocop warning | James Lopez | 2016-05-18 | 1 | -1/+0 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' of ↵ | James Lopez | 2016-05-18 | 3 | -4/+15 | |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into feature/project-import | |||||
| | | * | | | | | | | fixed CI commits on export | James Lopez | 2016-05-18 | 3 | -4/+15 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge branches 'feature/project-export-ui-experimental' and ↵ | James Lopez | 2016-05-18 | 2 | -2/+9 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental | |||||
| | * | | | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' of ↵ | James Lopez | 2016-05-18 | 1 | -1/+0 | |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into feature/project-import | |||||
| | | * | | | | | | | updated import export conf | James Lopez | 2016-05-18 | 1 | -1/+0 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | update relation factory with new models exceptions | James Lopez | 2016-05-18 | 1 | -1/+9 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | revert changes as builds are related to statuses which are already there | James Lopez | 2016-05-18 | 3 | -106/+23 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | added commits mapper and DB config import stuff | James Lopez | 2016-05-18 | 3 | -23/+106 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' of ↵ | James Lopez | 2016-05-18 | 1 | -0/+7 | |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into feature/project-import | |||||
| * | | | | | | | | | Merge branches 'feature/project-export' and ↵ | James Lopez | 2016-05-18 | 1 | -0/+7 | |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | 'feature/project-export-ui-experimental' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental | |||||
| | * | | | | | | | | added DB configuration | James Lopez | 2016-05-18 | 1 | -0/+7 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge branches 'feature/project-export-ui-experimental' and ↵ | James Lopez | 2016-05-17 | 1 | -0/+2 | |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental | |||||
| | * | | | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' of ↵ | James Lopez | 2016-05-17 | 1 | -0/+2 | |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into feature/project-import | |||||
| | | * | | | | | | | fix specs | James Lopez | 2016-05-17 | 1 | -0/+2 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce ↵ | James Lopez | 2016-05-16 | 1 | -2/+10 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | into feature/project-export-ui-experimental | |||||
| | * | | | | | | | | fix issue with forked MRs | James Lopez | 2016-05-16 | 1 | -2/+10 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce ↵ | James Lopez | 2016-05-16 | 4 | -4/+9 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | into feature/project-export-ui-experimental | |||||
| | * | | | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' of ↵ | James Lopez | 2016-05-16 | 3 | -2/+7 | |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into feature/project-import | |||||
| | | * | | | | | | | fix version issue | James Lopez | 2016-05-16 | 3 | -2/+7 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | fix version | James Lopez | 2016-05-16 | 1 | -2/+2 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge branches 'feature/project-export-ui-experimental' and ↵ | James Lopez | 2016-05-16 | 4 | -1/+77 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental | |||||
| | * | | | | | | | | missing new line | James Lopez | 2016-05-16 | 1 | -0/+1 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | added version check on import | James Lopez | 2016-05-16 | 3 | -2/+42 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' of ↵ | James Lopez | 2016-05-16 | 2 | -0/+35 | |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into feature/project-import | |||||
| | | * | | | | | | | adding versioning to export | James Lopez | 2016-05-16 | 2 | -0/+35 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge branches 'feature/project-export-ui-experimental' and ↵ | James Lopez | 2016-05-16 | 4 | -9/+13 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental | |||||
| | * | | | | | | | | fix merge conflicts | James Lopez | 2016-05-16 | 4 | -9/+13 | |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | ||||||
| | | * | | | | | | | some changes based on MR feedback | James Lopez | 2016-05-16 | 4 | -9/+13 | |
| | | | | | | | | | |