summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | fixed merge conflictsJames Lopez2016-06-1632-118/+493
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project...feature/project-exportJames Lopez2016-06-1632-118/+493
| | | |\ \ \ \ \
| | | * | | | | | Revert "squashed merge and fixed conflicts"James Lopez2016-06-1631-490/+110
| | | * | | | | | squashed merge and fixed conflictsJames Lopez2016-06-1631-110/+490
| * | | | | | | | fix wiki stuffJames Lopez2016-06-161-2/+1
| * | | | | | | | fix specsJames Lopez2016-06-161-1/+1
| * | | | | | | | lots of refactoring again based on feedback. Changed the UI slightly and also...James Lopez2016-06-153-3/+4
| * | | | | | | | yay finally importing working with the new services structureJames Lopez2016-06-141-2/+2
| * | | | | | | | few fixes after refactoring the whole UI stuffJames Lopez2016-06-143-6/+4
| * | | | | | | | adapted current services stuff to use new project import, plus fixes a few is...James Lopez2016-06-144-33/+21
| * | | | | | | | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-...James Lopez2016-06-141-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | fix merge issueJames Lopez2016-06-141-1/+1
| * | | | | | | | adding notifications stuff and more refactoring for exporting projectsJames Lopez2016-06-142-23/+21
| * | | | | | | | new export stuff and viewJames Lopez2016-06-141-1/+1
| * | | | | | | | lots of refactoring to reuse import serviceJames Lopez2016-06-147-161/+109
| * | | | | | | | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-...James Lopez2016-06-146-9/+8
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | updated relation_factory based on MR feedbackJames Lopez2016-06-141-3/+3
| | * | | | | | | fix mergeJames Lopez2016-06-141-1/+1
| | * | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' of gitla...James Lopez2016-06-144-5/+4
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | missed line breakJames Lopez2016-06-141-0/+1
| | | * | | | | | few changes based on MR feedbackJames Lopez2016-06-132-2/+2
| | | * | | | | | fix file.writeJames Lopez2016-06-131-3/+1
| * | | | | | | | WIP - starting refactoring import/export to use servicesJames Lopez2016-06-132-3/+30
| * | | | | | | | Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into...James Lopez2016-06-133-33/+39
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | refactored notes logicJames Lopez2016-06-131-3/+5
| | * | | | | | | few more changes based on feedbackJames Lopez2016-06-133-16/+25
| | * | | | | | | addressing MR feedback, few changes to members mapperJames Lopez2016-06-131-15/+10
| * | | | | | | | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-...James Lopez2016-06-133-3/+3
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | corrected a few warningsJames Lopez2016-06-133-3/+3
| * | | | | | | | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-...James Lopez2016-06-13164-1514/+3189
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' of gitla...James Lopez2016-06-131-1/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | fixed deprecation warningJames Lopez2016-06-131-1/+1
| | * | | | | | | fixed specs and refactored a few things due to recent model changes and merge...James Lopez2016-06-132-8/+3
| | * | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' of gitla...James Lopez2016-06-13155-1369/+3047
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | added comments to import export reader classJames Lopez2016-06-131-0/+29
| | | * | | | | | refactored loads of things due to commits to pipeline changeJames Lopez2016-06-132-4/+3
| | | * | | | | | few more modifications based on commentsJames Lopez2016-06-132-7/+12
| | | * | | | | | Merge branches 'feature/project-export' and 'master' of gitlab.com:gitlab-org...James Lopez2016-06-1363-517/+867
| | | |\ \ \ \ \ \
| | | * | | | | | | WIP - added missing notes, trying to fix specsJames Lopez2016-06-031-1/+3
| | | * | | | | | | started refactoring a bunch of stuff based on feedbackJames Lopez2016-06-035-12/+6
| | | * | | | | | | merge hellJames Lopez2016-06-03107-879/+2174
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Revert "Fix merge conflicts - squashed commit"James Lopez2016-06-03107-2174/+879
| | | * | | | | | | | Fix merge conflicts - squashed commitJames Lopez2016-06-03107-879/+2174
| | | * | | | | | | | updated uploads saverJames Lopez2016-05-191-3/+8
| | | * | | | | | | | fix pathJames Lopez2016-05-191-1/+1
| | * | | | | | | | | refactoring more things based on MR feedbackJames Lopez2016-06-024-7/+13
| | * | | | | | | | | refactoring relation factory, changed from module to classJames Lopez2016-06-022-58/+72
| | * | | | | | | | | more and more refactoringJames Lopez2016-06-026-46/+41
| | * | | | | | | | | started refactoring some stuff based on MR feedbackJames Lopez2016-06-014-49/+37
| * | | | | | | | | | a few nice to have and updated changelogJames Lopez2016-05-201-0/+13
View Lorry Controller Status