| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch '14918-add-filter-dropdown-to-tag-page' into 'master'
| Rémy Coutable | 2016-06-17 | 1 | -0/+19 |
|\ |
|
| * | Add sorting dropdown to tag page14918-add-filter-dropdown-to-tag-page | Alejandro Rodríguez | 2016-06-16 | 1 | -0/+19 |
* | | Merge branch 'feature/project-export' into 'master'
| Douwe Maan | 2016-06-17 | 9 | -14/+61 |
|\ \ |
|
| * | | a few changes based on MR feedback | James Lopez | 2016-06-17 | 1 | -1/+1 |
| * | | fixed merge conflicts on UI branch | James Lopez | 2016-06-16 | 24 | -172/+344 |
| |\ \ |
|
| | * \ | fixed merge conflicts | James Lopez | 2016-06-16 | 24 | -172/+344 |
| | |\ \ |
|
| | | * \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project...feature/project-export | James Lopez | 2016-06-16 | 24 | -172/+344 |
| | | |\ \ |
|
| | | * | | | Revert "squashed merge and fixed conflicts" | James Lopez | 2016-06-16 | 24 | -344/+172 |
| | | * | | | squashed merge and fixed conflicts | James Lopez | 2016-06-16 | 24 | -172/+344 |
| * | | | | | lots of refactoring again based on feedback. Changed the UI slightly and also... | James Lopez | 2016-06-15 | 1 | -2/+11 |
| * | | | | | some refactoring - renaming things, etc.. | James Lopez | 2016-06-15 | 1 | -3/+3 |
| * | | | | | project export archiver | James Lopez | 2016-06-14 | 1 | -0/+9 |
| * | | | | | adapted current services stuff to use new project import, plus fixes a few is... | James Lopez | 2016-06-14 | 1 | -1/+1 |
| * | | | | | new export stuff and view | James Lopez | 2016-06-14 | 1 | -10/+0 |
| * | | | | | lots of refactoring to reuse import service | James Lopez | 2016-06-14 | 2 | -4/+4 |
| * | | | | | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-... | James Lopez | 2016-06-13 | 98 | -2256/+1284 |
| |\ \ \ \ \
| | |/ / / / |
|
| | * | | | | fixed specs and refactored a few things due to recent model changes and merge... | James Lopez | 2016-06-13 | 2 | -3/+5 |
| | * | | | | Merge branches 'feature/project-export' and 'feature/project-import' of gitla... | James Lopez | 2016-06-13 | 97 | -2243/+1268 |
| | |\ \ \ \
| | | |/ / / |
|
| | | * | | | refactored loads of things due to commits to pipeline change | James Lopez | 2016-06-13 | 1 | -4/+4 |
| | | * | | | Merge branches 'feature/project-export' and 'master' of gitlab.com:gitlab-org... | James Lopez | 2016-06-13 | 21 | -165/+398 |
| | | |\ \ \ |
|
| | | * | | | | WIP - added missing notes, trying to fix specs | James Lopez | 2016-06-03 | 1 | -0/+4 |
| | | * | | | | merge hell | James Lopez | 2016-06-03 | 94 | -2089/+877 |
| | | |\ \ \ \ |
|
| | | * | | | | | Revert "Fix merge conflicts - squashed commit" | James Lopez | 2016-06-03 | 94 | -877/+2089 |
| | | * | | | | | Fix merge conflicts - squashed commit | James Lopez | 2016-06-03 | 94 | -2089/+877 |
| | * | | | | | | started refactoring some stuff based on MR feedback | James Lopez | 2016-06-01 | 4 | -12/+16 |
| * | | | | | | | a few nice to have and updated changelog | James Lopez | 2016-05-20 | 2 | -0/+7 |
| * | | | | | | | 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 branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into... | James Lopez | 2016-05-09 | 74 | -329/+513 |
| |\ \ \ \ \ \ \
| | |/ / / / / / |
|
| | * | | | | | | Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into... | James Lopez | 2016-05-09 | 74 | -329/+513 |
| | |\ \ \ \ \ \
| | | |/ / / / / |
|
| | | * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project... | James Lopez | 2016-05-09 | 74 | -329/+513 |
| | | |\ \ \ \ \ |
|
| * | | \ \ \ \ \ | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-... | James Lopez | 2016-05-04 | 1 | -0/+10 |
| |\ \ \ \ \ \ \ \
| | |/ / / / / / / |
|
| | * | | | | | | | Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into... | James Lopez | 2016-05-04 | 1 | -0/+10 |
| | |\ \ \ \ \ \ \
| | | |/ / / / / / |
|
| | | * | | | | | | add export worker to process project export async | James Lopez | 2016-05-04 | 1 | -0/+10 |
| * | | | | | | | | Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into... | James Lopez | 2016-05-03 | 17 | -28/+62 |
| |\ \ \ \ \ \ \ \
| | |/ / / / / / / |
|
| | * | | | | | | | picking stuff from ui related to import | James Lopez | 2016-05-03 | 1 | -0/+10 |
| | * | | | | | | | Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into... | James Lopez | 2016-05-03 | 17 | -28/+62 |
| | |\ \ \ \ \ \ \
| | | |/ / / / / / |
|
| * | | | | | | | | adding more UI changes, updated controller, worker and refactored import service | James Lopez | 2016-04-26 | 1 | -4/+4 |
| * | | | | | | | | more refactoring, now using custom job for processing project imports | James Lopez | 2016-04-26 | 1 | -0/+10 |
| * | | | | | | | | Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into... | James Lopez | 2016-04-25 | 2 | -11/+5 |
| |\ \ \ \ \ \ \ \
| | |/ / / / / / / |
|
| | * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project... | James Lopez | 2016-04-25 | 2 | -11/+5 |
| | |\ \ \ \ \ \ \ |
|
| * | | | | | | | | | gitlab import UI - icon, file selector, etc... Also updated font-awesome and ... | James Lopez | 2016-04-22 | 1 | -1/+1 |
| |/ / / / / / / / |
|
| * | | | | | | | | fix conflicts | James Lopez | 2016-04-21 | 40 | -361/+645 |
| |\ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ | Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into... | James Lopez | 2016-04-12 | 1 | -3/+5 |
| |\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | fixing more importing issues | James Lopez | 2016-04-12 | 1 | -1/+3 |
| * | | | | | | | | | | Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into... | James Lopez | 2016-04-08 | 24 | -131/+288 |
| |\ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ | Merge branches 'feature/project-import' and 'master' of gitlab.com:gitlab-org... | James Lopez | 2016-03-21 | 25 | -200/+374 |
| |\ \ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branches 'feature/project-export' and 'feature/project-import' of gitla... | James Lopez | 2016-03-14 | 20 | -122/+288 |
| |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | don't create MR diff as this can be imported presumably | James Lopez | 2016-03-14 | 1 | -1/+1 |
| * | | | | | | | | | | | | | fixed MR issue and refactored some stuff | James Lopez | 2016-03-14 | 1 | -1/+1 |