summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | a few nice to have and updated changelogJames Lopez2016-05-204-3/+16
| * | | | | | | | | | fix merge conflictsJames Lopez2016-05-191-4/+5
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | import uploads. Fixed a few things to do with members, triggers, etc...James Lopez2016-05-191-4/+5
| | * | | | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' of gitla...James Lopez2016-05-191-1/+5
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | uploads exportJames Lopez2016-05-191-1/+5
| * | | | | | | | | | Squashed commit of the following:James Lopez2016-05-191-1/+5
| * | | | | | | | | | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-...James Lopez2016-05-161-3/+8
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' of gitla...James Lopez2016-05-161-3/+8
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | adding versioning to exportJames Lopez2016-05-161-3/+8
| * | | | | | | | | | fixed permissionsJames Lopez2016-05-131-5/+1
| * | | | | | | | | | updated controllers with permissions checkJames Lopez2016-05-133-69/+19
| * | | | | | | | | | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-...James Lopez2016-05-111-1/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | refactored import to use shared error stuff and fixed a few issues with recen...James Lopez2016-05-111-1/+0
| * | | | | | | | | | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-...James Lopez2016-05-112-3/+2
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' of gitla...James Lopez2016-05-112-3/+2
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | fixing more export problemsJames Lopez2016-05-112-3/+2
| * | | | | | | | | | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-...James Lopez2016-05-111-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | fix log statementJames Lopez2016-05-111-1/+1
| * | | | | | | | | | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-...James Lopez2016-05-101-2/+6
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' of gitla...James Lopez2016-05-101-2/+6
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | added better error handling. Also refactored some of the code and fixed a few...James Lopez2016-05-101-2/+6
| * | | | | | | | | | Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into...James Lopez2016-05-09183-625/+1010
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into...James Lopez2016-05-09183-625/+1010
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project...James Lopez2016-05-09183-625/+1010
| | | |\ \ \ \ \ \ \ \
| * | | \ \ \ \ \ \ \ \ Merge branches 'feature/project-export-ui-experimental' and 'feature/project-...James Lopez2016-05-061-4/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' of gitla...James Lopez2016-05-061-4/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | fixed and refactored a few things based on MR feedbackJames Lopez2016-05-061-4/+1
| * | | | | | | | | | | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-...James Lopez2016-05-051-9/+9
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | handling errors a bit better on import failureJames Lopez2016-05-051-9/+9
| * | | | | | | | | | | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-...James Lopez2016-05-051-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' of gitla...James Lopez2016-05-051-0/+6
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | update repo and wiki repo bundler to use git bundle instead of compressing vi...James Lopez2016-05-051-0/+6
| * | | | | | | | | | | add gitlab project controller - still WIPJames Lopez2016-05-041-0/+45
| * | | | | | | | | | | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-...James Lopez2016-05-041-45/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | refactored some namespace stuff and fixed project tree restorer spec. also re...James Lopez2016-05-041-45/+0
| * | | | | | | | | | | typos in export pageJames Lopez2016-05-041-3/+3
| * | | | | | | | | | | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-...James Lopez2016-05-043-1/+24
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into...James Lopez2016-05-042-0/+23
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | add export worker to process project export asyncJames Lopez2016-05-042-0/+23
| | * | | | | | | | | | updated import workerJames Lopez2016-05-041-1/+1
| * | | | | | | | | | | use worker in controllerJames Lopez2016-05-041-3/+6
| * | | | | | | | | | | typoJames Lopez2016-05-031-2/+2
| * | | | | | | | | | | typoJames Lopez2016-05-031-1/+1
| * | | | | | | | | | | Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into...James Lopez2016-05-03117-874/+1419
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | fixing some rubucop warningsJames Lopez2016-05-032-3/+2
| | * | | | | | | | | | picking stuff from ui related to importJames Lopez2016-05-032-0/+35
| | * | | | | | | | | | Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into...James Lopez2016-05-03117-875/+1376
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Merge branches 'feature/project-export' and 'master' of gitlab.com:gitlab-org...James Lopez2016-05-03147-1038/+1612
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | picking export stuff from the UI branchJames Lopez2016-05-031-1/+2
| * | | | | | | | | | | | fixing issues with project members mapping. Also added some more JS magic to ...James Lopez2016-05-021-0/+11