summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Expand)AuthorAgeFilesLines
* Revert "Fixed Import/Export foreign key issue to do with project members"Robert Speicher2016-11-011-37/+0
* Fixed Import/Export foreign key issue to do with project membersJames Lopez2016-11-011-0/+37
* Removes any symlinks before importing a project export file. Also added relev...James Lopez2016-11-013-1/+71
* Merge branch 'fix/export-att-inclusion' into 'master'Douwe Maan2016-08-161-1/+2
* Merge branch 'fix/import-error' into 'master'Rémy Coutable2016-08-041-0/+30
* Merge branch '20527-fork-commits-have-impact-on-original-project' into 'master'Rémy Coutable2016-08-041-0/+11
* Merge branch 'fix-extra-new-line-crlf' into 'master'Rémy Coutable2016-08-011-0/+12
* Merge branch 'fix/labels-milestones-import' into 'master'Rémy Coutable2016-08-013-141/+77
* Merge branch '20189-markdown-video-doesn-t-work-when-the-referenced-video-fil...Rémy Coutable2016-07-271-0/+25
* Merge branch 'use-project-id-in-repo-cache' into 'master'Yorick Peterse2016-07-271-6/+7
* Merge branch 'migration-downtime-tags' into 'master' Robert Speicher2016-07-212-0/+130
* Merge branch '4142-show-inline-video' into 'master' Rémy Coutable2016-07-213-2/+51
* Merge branch '20003-newnoteworker-failing-repeatedly-with-argumenterror-wrong...Rémy Coutable2016-07-201-0/+24
* Merge branch 'allow-deploy-key-to-download-public-projects' into 'master' Rémy Coutable2016-07-191-11/+61
* Merge branch 'fix-retries-on-old-builds' into 'master' Rémy Coutable2016-07-191-1/+1
* Merge branch 'manual-actions' into 'master' Rémy Coutable2016-07-191-1/+1
* Merge branch 'fix/import-export-project-avatar' into 'master' Rémy Coutable2016-07-192-0/+52
* Merge branch '18593-avoid-parse_html-when-rinku-didnt-do-anything' into 'mast...Yorick Peterse2016-07-191-0/+20
* Merge branch 'undo-revert-of-4892' into 'master' Rémy Coutable2016-07-193-134/+204
* Merge branch '19820-safer-diffs' into 'master' Douwe Maan2016-07-191-0/+14
* Merge branch 'fix/import-export-encoding' into 'master' James Lopez2016-07-193-11/+23
* Merge branch 'store-variables-and-when-in-builds-table' into 'master' Rémy Coutable2016-07-181-66/+83
|\
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into store-variables...store-variables-and-when-in-builds-tableKamil Trzcinski2016-07-188-740/+64
| |\
| * | Refactor gitlab_ci_yaml_processor variables testsKamil Trzcinski2016-07-171-52/+76
| * | Fix gitlab_ci_yaml_processor_spec.rbKamil Trzcinski2016-07-161-5/+5
| * | Fix gitlab_ci_yaml_processor_spec.rbKamil Trzcinski2016-07-161-1/+1
| * | Store when and yaml variables in builds tableKamil Trzcinski2016-07-161-14/+7
* | | Merge branch 'docker-registry-work-with-redirect' into 'master' Rémy Coutable2016-07-182-14/+87
|\ \ \ | |_|/ |/| |
| * | Explicitly remove authorization token and make sure that invalid addresses ar...Kamil Trzcinski2016-07-152-14/+87
* | | Merge branch 'fix-lfs-ci-fetch' into 'master' Rémy Coutable2016-07-181-730/+0
|\ \ \
| * | | Refactor LFS specs to use requests instead of LfsRouterKamil Trzcinski2016-07-151-730/+0
* | | | Fix spec to set import_url before attempting to create import_dataallow-blank-import-urlStan Hu2016-07-171-1/+1
* | | | Don't fail to highlight when Rouge doesn't have a lexerDouwe Maan2016-07-151-7/+27
* | | | Merge branch 'feature.rouge-20' into 'master' Robert Speicher2016-07-152-4/+4
|\ \ \ \
| * | | | stub out errors from the formatterhttp://jneen.net/2016-07-141-1/+1
| * | | | don't expect a random newline at the end of the thing?http://jneen.net/2016-07-141-1/+1
| * | | | apparently this gets encoded now?http://jneen.net/2016-07-141-1/+1
| * | | | we no longer encode double-quoteshttp://jneen.net/2016-07-141-3/+3
| | |_|/ | |/| |
* | | | Merge branch 'fix/project-export-filename' into 'master' Douwe Maan2016-07-151-0/+21
|\ \ \ \
| * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-exp...fix/project-export-filenameJames Lopez2016-07-152-0/+12
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | add project name and namespace to filename on project exportJames Lopez2016-07-151-0/+21
| | |/ / | |/| |
* | | | Merge branch 'fix/ee-to-ce-import'Douwe Maan2016-07-151-0/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | fix EE => CE project import, and updated JSON specJames Lopez2016-07-141-0/+1
| |/ /
* | | Merge branch 'disable-statement-timeout' into 'master' Robert Speicher2016-07-151-0/+4
|\ \ \
| * | | Fix spec Don't attempt to disable statement timeout on a MySQL DBdisable-statement-timeoutStan Hu2016-07-141-0/+4
| |/ /
* | | fix updated_at not preserved after import - for GitLab projectsJames Lopez2016-07-141-0/+8
|/ /
* | Merge branch 'fix-label-reference-filter' into 'master' Robert Speicher2016-07-131-11/+99
|\ \
| * | Fix markdown rendering for label references that contains `.`Douglas Barbosa Alexandre2016-07-131-13/+13
| * | Fix markdown rendering for label references that begin with a digitDouglas Barbosa Alexandre2016-07-131-0/+48
| * | Fix markdown rendering for consecutive label referencesDouglas Barbosa Alexandre2016-07-131-0/+40