summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Copied original whitespace button test, ready to add to compare diffsadd-compare-diff-whitespace-button-testLuke "Jared" Bennett2016-06-171-0/+22
* Merge branch 'feature/project-export' into 'master' Douwe Maan2016-06-1769-42/+7239
|\
| * Merge branch 'feature/project-import' into 'feature/project-export' Douwe Maan2016-06-1760-63/+6353
| |\
| | * Merge branch 'feature/project-export-ui-experimental' into 'feature/project-i...feature/project-importDouwe Maan2016-06-1745-218/+503
| | |\
| | | * a few changes based on MR feedbackJames Lopez2016-06-176-10/+17
| | | * fixed changelog - [ci skip]feature/project-export-ui-experimentalJames Lopez2016-06-161-9/+0
| | | * fixed merge conflicts on UI branchJames Lopez2016-06-16405-3053/+16766
| | | |\ | | | |/ | | |/|
| | * | fixed merge conflictsJames Lopez2016-06-16405-3056/+16760
| | |\ \ | | |/ / | |/| |
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project...feature/project-exportJames Lopez2016-06-16405-3056/+16760
| |\ \ \
| * | | | Revert "squashed merge and fixed conflicts"James Lopez2016-06-16403-16738/+3046
| * | | | squashed merge and fixed conflictsJames Lopez2016-06-16403-3046/+16738
| * | | | fix indentsJames Lopez2016-06-141-5/+5
| | | | * fix spinach testJames Lopez2016-06-161-1/+1
| | | | * 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-1516-64/+105
| | | | * fix annoying specJames Lopez2016-06-151-1/+1
| | | | * fixing specs and some code cleanupJames Lopez2016-06-156-7/+13
| | | | * cleanup namespace check now done by serviceJames Lopez2016-06-151-11/+0
| | | | * enable retry on workerJames Lopez2016-06-151-2/+1
| | | | * fix changelogJames Lopez2016-06-151-2/+1
| | | | * some refactoring - renaming things, etc..James Lopez2016-06-153-8/+8
| | | | * project export archiverJames Lopez2016-06-144-3/+22
| | | | * get rid of old workerJames Lopez2016-06-141-24/+0
| | | | * yay finally importing working with the new services structureJames Lopez2016-06-143-3/+3
| | | | * few fixes after refactoring the whole UI stuffJames Lopez2016-06-145-10/+8
| | | | * adapted current services stuff to use new project import, plus fixes a few is...James Lopez2016-06-148-49/+42
| | | | * 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-1413-29/+84
| | | | * new export stuff and viewJames Lopez2016-06-144-12/+26
| | | | * lots of refactoring to reuse import serviceJames Lopez2016-06-1415-179/+143
| | | | * Merge branches 'feature/project-export-ui-experimental' and 'feature/project-...James Lopez2016-06-148-35/+95
| | | | |\ | | | | |/ | | | |/|
| | | * | updated relation_factory based on MR feedbackJames Lopez2016-06-141-3/+3
| | | * | fix mergeJames Lopez2016-06-142-6/+6
| | | * | Merge branches 'feature/project-export' and 'feature/project-import' of gitla...James Lopez2016-06-146-31/+91
| | | |\ \ | | |_|/ / | |/| | |
| * | | | missed line breakJames Lopez2016-06-141-0/+1
| * | | | better coverage for ReaderJames Lopez2016-06-141-0/+61
| * | | | few changes based on MR feedbackJames Lopez2016-06-133-3/+3
| * | | | fix file.writeJames Lopez2016-06-131-3/+1
| | | | * WIP - starting refactoring import/export to use servicesJames Lopez2016-06-135-8/+55
| | | | * Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into...James Lopez2016-06-134-34/+40
| | | | |\ | | | | |/ | | | |/|
| | | * | refactored notes logicJames Lopez2016-06-131-3/+5
| | | * | few more changes based on feedbackJames Lopez2016-06-134-17/+26
| | | * | 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
| | | | * fix gemfileJames Lopez2016-06-131-2/+2
| | | | * Merge branches 'feature/project-export-ui-experimental' and 'feature/project-...James Lopez2016-06-131841-12581/+33110
| | | | |\ | | | | |/ | | | |/|
| | | * | Merge branches 'feature/project-export' and 'feature/project-import' of gitla...James Lopez2016-06-131-1/+1
| | | |\ \ | | |_|/ / | |/| | |
View Lorry Controller Status