Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | * | | | | | | | | | Revert "squashed merge and fixed conflicts" | James Lopez | 2016-06-16 | 31 | -490/+110 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 13e37a3ee5c943525a99481b855d654e97e8597c. | |||||
| | | * | | | | | | | | | squashed merge and fixed conflicts | James Lopez | 2016-06-16 | 31 | -110/+490 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | fix wiki stuff | James Lopez | 2016-06-16 | 1 | -2/+1 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | fix specs | James Lopez | 2016-06-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | lots of refactoring again based on feedback. Changed the UI slightly and ↵ | James Lopez | 2016-06-15 | 3 | -3/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also fixed a small bug | |||||
| * | | | | | | | | | | | yay finally importing working with the new services structure | James Lopez | 2016-06-14 | 1 | -2/+2 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | few fixes after refactoring the whole UI stuff | James Lopez | 2016-06-14 | 3 | -6/+4 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | adapted current services stuff to use new project import, plus fixes a few ↵ | James Lopez | 2016-06-14 | 4 | -33/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issues, updated routes, etc... | |||||
| * | | | | | | | | | | | Merge branches 'feature/project-export-ui-experimental' and ↵ | James Lopez | 2016-06-14 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental | |||||
| | * | | | | | | | | | | fix merge issue | James Lopez | 2016-06-14 | 1 | -1/+1 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | adding notifications stuff and more refactoring for exporting projects | James Lopez | 2016-06-14 | 2 | -23/+21 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | new export stuff and view | James Lopez | 2016-06-14 | 1 | -1/+1 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | lots of refactoring to reuse import service | James Lopez | 2016-06-14 | 7 | -161/+109 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge branches 'feature/project-export-ui-experimental' and ↵ | James Lopez | 2016-06-14 | 6 | -9/+8 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental | |||||
| | * | | | | | | | | | | updated relation_factory based on MR feedback | James Lopez | 2016-06-14 | 1 | -3/+3 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | fix merge | James Lopez | 2016-06-14 | 1 | -1/+1 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' of ↵ | James Lopez | 2016-06-14 | 4 | -5/+4 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into feature/project-import | |||||
| | | * | | | | | | | | | missed line break | James Lopez | 2016-06-14 | 1 | -0/+1 | |
| | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | few changes based on MR feedback | James Lopez | 2016-06-13 | 2 | -2/+2 | |
| | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | fix file.write | James Lopez | 2016-06-13 | 1 | -3/+1 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | WIP - starting refactoring import/export to use services | James Lopez | 2016-06-13 | 2 | -3/+30 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce ↵ | James Lopez | 2016-06-13 | 3 | -33/+39 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | into feature/project-export-ui-experimental | |||||
| | * | | | | | | | | | | refactored notes logic | James Lopez | 2016-06-13 | 1 | -3/+5 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | few more changes based on feedback | James Lopez | 2016-06-13 | 3 | -16/+25 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | addressing MR feedback, few changes to members mapper | James Lopez | 2016-06-13 | 1 | -15/+10 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge branches 'feature/project-export-ui-experimental' and ↵ | James Lopez | 2016-06-13 | 3 | -3/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental | |||||
| | * | | | | | | | | | | corrected a few warnings | James Lopez | 2016-06-13 | 3 | -3/+3 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge branches 'feature/project-export-ui-experimental' and ↵ | James Lopez | 2016-06-13 | 164 | -1514/+3189 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental # Conflicts: # Gemfile.lock # app/helpers/todos_helper.rb # app/models/todo.rb # app/views/projects/edit.html.haml # lib/gitlab/import_export/import_service.rb | |||||
| | * | | | | | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' of ↵ | James Lopez | 2016-06-13 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into feature/project-import | |||||
| | | * | | | | | | | | | fixed deprecation warning | James Lopez | 2016-06-13 | 1 | -1/+1 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | fixed specs and refactored a few things due to recent model changes and ↵ | James Lopez | 2016-06-13 | 2 | -8/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge conflicts | |||||
| | * | | | | | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' of ↵ | James Lopez | 2016-06-13 | 155 | -1369/+3047 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into feature/project-import # Conflicts: # app/models/project.rb # db/schema.rb # lib/gitlab/import_export/import_export_reader.rb | |||||
| | | * | | | | | | | | | added comments to import export reader class | James Lopez | 2016-06-13 | 1 | -0/+29 | |
| | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | refactored loads of things due to commits to pipeline change | James Lopez | 2016-06-13 | 2 | -4/+3 | |
| | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | few more modifications based on comments | James Lopez | 2016-06-13 | 2 | -7/+12 | |
| | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | Merge branches 'feature/project-export' and 'master' of ↵ | James Lopez | 2016-06-13 | 63 | -517/+867 | |
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into feature/project-export | |||||
| | | * | | | | | | | | | | WIP - added missing notes, trying to fix specs | James Lopez | 2016-06-03 | 1 | -1/+3 | |
| | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | started refactoring a bunch of stuff based on feedback | James Lopez | 2016-06-03 | 5 | -12/+6 | |
| | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | merge hell | James Lopez | 2016-06-03 | 107 | -879/+2174 | |
| | | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | Revert "Fix merge conflicts - squashed commit" | James Lopez | 2016-06-03 | 107 | -2174/+879 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3e99123095b26988de67a94b0e7a5207c1ef5ae2. | |||||
| | | * | | | | | | | | | | | Fix merge conflicts - squashed commit | James Lopez | 2016-06-03 | 107 | -879/+2174 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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 | |
| | | | | | | | | | | | | | |