Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Corrected top area css media query paramslbennett/gitlab-ce-18490-top-area-css-tablet-view | Luke "Jared" Bennett | 2016-06-17 | 1 | -1/+2 |
* | Merge branch 'feature/project-export' into 'master' | Douwe Maan | 2016-06-17 | 69 | -42/+7239 |
|\ | |||||
| * | Merge branch 'feature/project-import' into 'feature/project-export' | Douwe Maan | 2016-06-17 | 60 | -63/+6353 |
| |\ | |||||
| | * | Merge branch 'feature/project-export-ui-experimental' into 'feature/project-i...feature/project-import | Douwe Maan | 2016-06-17 | 45 | -218/+503 |
| | |\ | |||||
| | | * | a few changes based on MR feedback | James Lopez | 2016-06-17 | 6 | -10/+17 |
| | | * | fixed changelog - [ci skip]feature/project-export-ui-experimental | James Lopez | 2016-06-16 | 1 | -9/+0 |
| | | * | fixed merge conflicts on UI branch | James Lopez | 2016-06-16 | 405 | -3053/+16766 |
| | | |\ | | | |/ | | |/| | |||||
| | * | | fixed merge conflicts | James Lopez | 2016-06-16 | 405 | -3056/+16760 |
| | |\ \ | | |/ / | |/| | | |||||
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project...feature/project-export | James Lopez | 2016-06-16 | 405 | -3056/+16760 |
| |\ \ \ | |||||
| * | | | | Revert "squashed merge and fixed conflicts" | James Lopez | 2016-06-16 | 403 | -16738/+3046 |
| * | | | | squashed merge and fixed conflicts | James Lopez | 2016-06-16 | 403 | -3046/+16738 |
| * | | | | fix indents | James Lopez | 2016-06-14 | 1 | -5/+5 |
| | | | * | fix spinach test | James Lopez | 2016-06-16 | 1 | -1/+1 |
| | | | * | fix wiki stuff | James Lopez | 2016-06-16 | 1 | -2/+1 |
| | | | * | fix specs | James Lopez | 2016-06-16 | 1 | -1/+1 |
| | | | * | lots of refactoring again based on feedback. Changed the UI slightly and also... | James Lopez | 2016-06-15 | 16 | -64/+105 |
| | | | * | fix annoying spec | James Lopez | 2016-06-15 | 1 | -1/+1 |
| | | | * | fixing specs and some code cleanup | James Lopez | 2016-06-15 | 6 | -7/+13 |
| | | | * | cleanup namespace check now done by service | James Lopez | 2016-06-15 | 1 | -11/+0 |
| | | | * | enable retry on worker | James Lopez | 2016-06-15 | 1 | -2/+1 |
| | | | * | fix changelog | James Lopez | 2016-06-15 | 1 | -2/+1 |
| | | | * | some refactoring - renaming things, etc.. | James Lopez | 2016-06-15 | 3 | -8/+8 |
| | | | * | project export archiver | James Lopez | 2016-06-14 | 4 | -3/+22 |
| | | | * | get rid of old worker | James Lopez | 2016-06-14 | 1 | -24/+0 |
| | | | * | yay finally importing working with the new services structure | James Lopez | 2016-06-14 | 3 | -3/+3 |
| | | | * | few fixes after refactoring the whole UI stuff | James Lopez | 2016-06-14 | 5 | -10/+8 |
| | | | * | adapted current services stuff to use new project import, plus fixes a few is... | James Lopez | 2016-06-14 | 8 | -49/+42 |
| | | | * | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-... | James Lopez | 2016-06-14 | 1 | -1/+1 |
| | | | |\ | | | | |/ | | | |/| | |||||
| | | * | | fix merge issue | James Lopez | 2016-06-14 | 1 | -1/+1 |
| | | | * | adding notifications stuff and more refactoring for exporting projects | James Lopez | 2016-06-14 | 13 | -29/+84 |
| | | | * | new export stuff and view | James Lopez | 2016-06-14 | 4 | -12/+26 |
| | | | * | lots of refactoring to reuse import service | James Lopez | 2016-06-14 | 15 | -179/+143 |
| | | | * | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-... | James Lopez | 2016-06-14 | 8 | -35/+95 |
| | | | |\ | | | | |/ | | | |/| | |||||
| | | * | | updated relation_factory based on MR feedback | James Lopez | 2016-06-14 | 1 | -3/+3 |
| | | * | | fix merge | James Lopez | 2016-06-14 | 2 | -6/+6 |
| | | * | | Merge branches 'feature/project-export' and 'feature/project-import' of gitla... | James Lopez | 2016-06-14 | 6 | -31/+91 |
| | | |\ \ | | |_|/ / | |/| | | | |||||
| * | | | | missed line break | James Lopez | 2016-06-14 | 1 | -0/+1 |
| * | | | | better coverage for Reader | James Lopez | 2016-06-14 | 1 | -0/+61 |
| * | | | | few changes based on MR feedback | James Lopez | 2016-06-13 | 3 | -3/+3 |
| * | | | | fix file.write | James Lopez | 2016-06-13 | 1 | -3/+1 |
| | | | * | WIP - starting refactoring import/export to use services | James Lopez | 2016-06-13 | 5 | -8/+55 |
| | | | * | Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into... | James Lopez | 2016-06-13 | 4 | -34/+40 |
| | | | |\ | | | | |/ | | | |/| | |||||
| | | * | | refactored notes logic | James Lopez | 2016-06-13 | 1 | -3/+5 |
| | | * | | few more changes based on feedback | James Lopez | 2016-06-13 | 4 | -17/+26 |
| | | * | | addressing MR feedback, few changes to members mapper | James Lopez | 2016-06-13 | 1 | -15/+10 |
| | | | * | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-... | James Lopez | 2016-06-13 | 3 | -3/+3 |
| | | | |\ | | | | |/ | | | |/| | |||||
| | | * | | corrected a few warnings | James Lopez | 2016-06-13 | 3 | -3/+3 |
| | | | * | fix gemfile | James Lopez | 2016-06-13 | 1 | -2/+2 |
| | | | * | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-... | James Lopez | 2016-06-13 | 1841 | -12581/+33110 |
| | | | |\ | | | | |/ | | | |/| | |||||
| | | * | | Merge branches 'feature/project-export' and 'feature/project-import' of gitla... | James Lopez | 2016-06-13 | 1 | -1/+1 |
| | | |\ \ | | |_|/ / | |/| | | |