summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '14918-add-filter-dropdown-to-tag-page' into 'master' Rémy Coutable2016-06-171-0/+19
|\
| * Add sorting dropdown to tag page14918-add-filter-dropdown-to-tag-pageAlejandro Rodríguez2016-06-161-0/+19
* | Merge branch 'feature/project-export' into 'master' Douwe Maan2016-06-179-14/+61
|\ \
| * | a few changes based on MR feedbackJames Lopez2016-06-171-1/+1
| * | fixed merge conflicts on UI branchJames Lopez2016-06-1624-172/+344
| |\ \
| | * \ fixed merge conflictsJames Lopez2016-06-1624-172/+344
| | |\ \
| | | * \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project...feature/project-exportJames Lopez2016-06-1624-172/+344
| | | |\ \
| | | * | | Revert "squashed merge and fixed conflicts"James Lopez2016-06-1624-344/+172
| | | * | | squashed merge and fixed conflictsJames Lopez2016-06-1624-172/+344
| * | | | | lots of refactoring again based on feedback. Changed the UI slightly and also...James Lopez2016-06-151-2/+11
| * | | | | some refactoring - renaming things, etc..James Lopez2016-06-151-3/+3
| * | | | | project export archiverJames Lopez2016-06-141-0/+9
| * | | | | adapted current services stuff to use new project import, plus fixes a few is...James Lopez2016-06-141-1/+1
| * | | | | new export stuff and viewJames Lopez2016-06-141-10/+0
| * | | | | lots of refactoring to reuse import serviceJames Lopez2016-06-142-4/+4
| * | | | | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-...James Lopez2016-06-1398-2256/+1284
| |\ \ \ \ \ | | |/ / / /
| | * | | | fixed specs and refactored a few things due to recent model changes and merge...James Lopez2016-06-132-3/+5
| | * | | | Merge branches 'feature/project-export' and 'feature/project-import' of gitla...James Lopez2016-06-1397-2243/+1268
| | |\ \ \ \ | | | |/ / /
| | | * | | refactored loads of things due to commits to pipeline changeJames Lopez2016-06-131-4/+4
| | | * | | Merge branches 'feature/project-export' and 'master' of gitlab.com:gitlab-org...James Lopez2016-06-1321-165/+398
| | | |\ \ \
| | | * | | | WIP - added missing notes, trying to fix specsJames Lopez2016-06-031-0/+4
| | | * | | | merge hellJames Lopez2016-06-0394-2089/+877
| | | |\ \ \ \
| | | * | | | | Revert "Fix merge conflicts - squashed commit"James Lopez2016-06-0394-877/+2089
| | | * | | | | Fix merge conflicts - squashed commitJames Lopez2016-06-0394-2089/+877
| | * | | | | | started refactoring some stuff based on MR feedbackJames Lopez2016-06-014-12/+16
| * | | | | | | a few nice to have and updated changelogJames Lopez2016-05-202-0/+7
| * | | | | | | 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 branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into...James Lopez2016-05-0974-329/+513
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into...James Lopez2016-05-0974-329/+513
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project...James Lopez2016-05-0974-329/+513
| | | |\ \ \ \ \
| * | | \ \ \ \ \ Merge branches 'feature/project-export-ui-experimental' and 'feature/project-...James Lopez2016-05-041-0/+10
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into...James Lopez2016-05-041-0/+10
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | add export worker to process project export asyncJames Lopez2016-05-041-0/+10
| * | | | | | | | Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into...James Lopez2016-05-0317-28/+62
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | picking stuff from ui related to importJames Lopez2016-05-031-0/+10
| | * | | | | | | Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into...James Lopez2016-05-0317-28/+62
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| * | | | | | | | adding more UI changes, updated controller, worker and refactored import serviceJames Lopez2016-04-261-4/+4
| * | | | | | | | more refactoring, now using custom job for processing project importsJames Lopez2016-04-261-0/+10
| * | | | | | | | Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into...James Lopez2016-04-252-11/+5
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project...James Lopez2016-04-252-11/+5
| | |\ \ \ \ \ \ \
| * | | | | | | | | gitlab import UI - icon, file selector, etc... Also updated font-awesome and ...James Lopez2016-04-221-1/+1
| |/ / / / / / / /
| * | | | | | | | fix conflictsJames Lopez2016-04-2140-361/+645
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into...James Lopez2016-04-121-3/+5
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | fixing more importing issuesJames Lopez2016-04-121-1/+3
| * | | | | | | | | | Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into...James Lopez2016-04-0824-131/+288
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branches 'feature/project-import' and 'master' of gitlab.com:gitlab-org...James Lopez2016-03-2125-200/+374
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branches 'feature/project-export' and 'feature/project-import' of gitla...James Lopez2016-03-1420-122/+288
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | don't create MR diff as this can be imported presumablyJames Lopez2016-03-141-1/+1
| * | | | | | | | | | | | | fixed MR issue and refactored some stuffJames Lopez2016-03-141-1/+1