Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | a few nice to have and updated changelog | James Lopez | 2016-05-20 | 4 | -3/+16 | |
| * | | | | | | | | | | fix merge conflicts | James Lopez | 2016-05-19 | 1 | -4/+5 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| | * | | | | | | | | | import uploads. Fixed a few things to do with members, triggers, etc... | James Lopez | 2016-05-19 | 1 | -4/+5 | |
| | * | | | | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' of gitla... | James Lopez | 2016-05-19 | 1 | -1/+5 | |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | ||||||
| | | * | | | | | | | | uploads export | James Lopez | 2016-05-19 | 1 | -1/+5 | |
| * | | | | | | | | | | Squashed commit of the following: | James Lopez | 2016-05-19 | 1 | -1/+5 | |
| * | | | | | | | | | | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-... | James Lopez | 2016-05-16 | 1 | -3/+8 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| | * | | | | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' of gitla... | James Lopez | 2016-05-16 | 1 | -3/+8 | |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | ||||||
| | | * | | | | | | | | adding versioning to export | James Lopez | 2016-05-16 | 1 | -3/+8 | |
| * | | | | | | | | | | fixed permissions | James Lopez | 2016-05-13 | 1 | -5/+1 | |
| * | | | | | | | | | | updated controllers with permissions check | James Lopez | 2016-05-13 | 3 | -69/+19 | |
| * | | | | | | | | | | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-... | James Lopez | 2016-05-11 | 1 | -1/+0 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| | * | | | | | | | | | refactored import to use shared error stuff and fixed a few issues with recen... | James Lopez | 2016-05-11 | 1 | -1/+0 | |
| * | | | | | | | | | | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-... | James Lopez | 2016-05-11 | 2 | -3/+2 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| | * | | | | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' of gitla... | James Lopez | 2016-05-11 | 2 | -3/+2 | |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | ||||||
| | | * | | | | | | | | fixing more export problems | James Lopez | 2016-05-11 | 2 | -3/+2 | |
| * | | | | | | | | | | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-... | James Lopez | 2016-05-11 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| | * | | | | | | | | | fix log statement | James Lopez | 2016-05-11 | 1 | -1/+1 | |
| * | | | | | | | | | | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-... | James Lopez | 2016-05-10 | 1 | -2/+6 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| | * | | | | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' of gitla... | James Lopez | 2016-05-10 | 1 | -2/+6 | |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | ||||||
| | | * | | | | | | | | added better error handling. Also refactored some of the code and fixed a few... | James Lopez | 2016-05-10 | 1 | -2/+6 | |
| * | | | | | | | | | | Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into... | James Lopez | 2016-05-09 | 183 | -625/+1010 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| | * | | | | | | | | | Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into... | James Lopez | 2016-05-09 | 183 | -625/+1010 | |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | ||||||
| | | * | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project... | James Lopez | 2016-05-09 | 183 | -625/+1010 | |
| | | |\ \ \ \ \ \ \ \ | ||||||
| * | | \ \ \ \ \ \ \ \ | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-... | James Lopez | 2016-05-06 | 1 | -4/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' of gitla... | James Lopez | 2016-05-06 | 1 | -4/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | ||||||
| | | * | | | | | | | | | fixed and refactored a few things based on MR feedback | James Lopez | 2016-05-06 | 1 | -4/+1 | |
| * | | | | | | | | | | | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-... | James Lopez | 2016-05-05 | 1 | -9/+9 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | handling errors a bit better on import failure | James Lopez | 2016-05-05 | 1 | -9/+9 | |
| * | | | | | | | | | | | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-... | James Lopez | 2016-05-05 | 1 | -0/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' of gitla... | James Lopez | 2016-05-05 | 1 | -0/+6 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | ||||||
| | | * | | | | | | | | | update repo and wiki repo bundler to use git bundle instead of compressing vi... | James Lopez | 2016-05-05 | 1 | -0/+6 | |
| * | | | | | | | | | | | add gitlab project controller - still WIP | James Lopez | 2016-05-04 | 1 | -0/+45 | |
| * | | | | | | | | | | | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-... | James Lopez | 2016-05-04 | 1 | -45/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | refactored some namespace stuff and fixed project tree restorer spec. also re... | James Lopez | 2016-05-04 | 1 | -45/+0 | |
| * | | | | | | | | | | | typos in export page | James Lopez | 2016-05-04 | 1 | -3/+3 | |
| * | | | | | | | | | | | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-... | James Lopez | 2016-05-04 | 3 | -1/+24 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into... | James Lopez | 2016-05-04 | 2 | -0/+23 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | ||||||
| | | * | | | | | | | | | add export worker to process project export async | James Lopez | 2016-05-04 | 2 | -0/+23 | |
| | * | | | | | | | | | | updated import worker | James Lopez | 2016-05-04 | 1 | -1/+1 | |
| * | | | | | | | | | | | use worker in controller | James Lopez | 2016-05-04 | 1 | -3/+6 | |
| * | | | | | | | | | | | typo | James Lopez | 2016-05-03 | 1 | -2/+2 | |
| * | | | | | | | | | | | typo | James Lopez | 2016-05-03 | 1 | -1/+1 | |
| * | | | | | | | | | | | Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into... | James Lopez | 2016-05-03 | 117 | -874/+1419 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | fixing some rubucop warnings | James Lopez | 2016-05-03 | 2 | -3/+2 | |
| | * | | | | | | | | | | picking stuff from ui related to import | James Lopez | 2016-05-03 | 2 | -0/+35 | |
| | * | | | | | | | | | | Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into... | James Lopez | 2016-05-03 | 117 | -875/+1376 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | ||||||
| | | * | | | | | | | | | Merge branches 'feature/project-export' and 'master' of gitlab.com:gitlab-org... | James Lopez | 2016-05-03 | 147 | -1038/+1612 | |
| | | |\ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | picking export stuff from the UI branch | James Lopez | 2016-05-03 | 1 | -1/+2 | |
| * | | | | | | | | | | | | fixing issues with project members mapping. Also added some more JS magic to ... | James Lopez | 2016-05-02 | 1 | -0/+11 |