summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ | | |/
| | * 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-135-314/+158
| * | Merge branches 'feature/project-export' and 'feature/project-import' of gitla...James Lopez2016-06-131830-12102/+32805
| |\ \ | | |/
| | * added comments to import export reader classJames Lopez2016-06-131-0/+29
| | * refactored loads of things due to commits to pipeline changeJames Lopez2016-06-135-20/+26
| | * 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-13874-4424/+13035
| | |\
| | | * Merge branch 'bug/svg_sanitizer' into 'master' Robert Speicher2016-06-133-13/+130
| | | |\
| | | | * Improved SVG sanitizer specs to include smoke tests for clean.bug/svg_sanitizerGabriel Mazetto2016-06-121-0/+16
| | | | * Refactored SVG sanitizerGabriel Mazetto2016-06-122-24/+41
| | | | * Added SVG sanitizer fix to the changelogGabriel Mazetto2016-06-121-0/+1
| | | | * Refactor SVG sanitizer and prevent `xlink:href` to refer to external resourcesGabriel Mazetto2016-06-122-8/+30
| | | | * Fix SVG whitelisting to allow namespaced attributesGabriel Mazetto2016-06-122-5/+66
| | | |/
| | | * Merge branch 'fix-closes-issues-error-500' into 'master' Robert Speicher2016-06-126-2/+42
| | | |\
| | | | * Fix Error 500 when using closes_issues API with an external issue trackerStan Hu2016-06-116-2/+42
| | | * | Merge branch 'nav-offscreen-dz-patch' into 'master' Dmitriy Zaporozhets2016-06-115-27/+3
| | | |\ \
| | | | * | Center layout navigation and remove iconsnav-offscreen-dz-patchDmitriy Zaporozhets2016-06-115-27/+3
| | | * | | Merge branch '18417-nav-offscreen' into 'master' Dmitriy Zaporozhets2016-06-1118-182/+130
| | | |\ \ \ | | | | |/ /
| | | | * | Fix preferences_spec test18417-nav-offscreenAnnabel Dunstone2016-06-103-8/+6
| | | | * | Add back sidebar counters and usernameAnnabel Dunstone2016-06-109-15/+33
| | | | * | Fix safari logo loading animation safari bugAnnabel Dunstone2016-06-102-8/+1
| | | | * | Revert side nav to full width; remove border under nav; remove tooltips on na...Annabel Dunstone2016-06-1012-145/+52
| | | | * | Update media queriesAnnabel Dunstone2016-06-101-3/+3
| | | | * | Fix profile testAnnabel Dunstone2016-06-102-1/+2
| | | | * | Fix logo at all screen widths, update sidebar textAnnabel Dunstone2016-06-107-56/+78
| | | | * | Move tanuki icon to center of nav bar; keep nav closed by default; remove col...Annabel Dunstone2016-06-108-36/+44
| | | * | | Merge branch '18463-search-form-padding-is-too-damn-high' into 'master' Dmitriy Zaporozhets2016-06-111-1/+0
| | | |\ \ \ | | | | |_|/ | | | |/| |
| | | | * | Fixed search form paddingLuke "Jared" Bennett2016-06-101-1/+0
| | | * | | Merge branch 'create-backup-dir-for-local' into 'master' Robert Speicher2016-06-101-3/+18
| | | |\ \ \