summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4142-show-inline-video' into 'master' Rémy Coutable2016-07-212-2/+0
|\
| * Get rid of `is_image` in FileUploaderRémy Coutable2016-07-192-2/+0
* | Merge branch 'migration-downtime-tags' into 'master' Robert Speicher2016-07-202-0/+130
|\ \
| * | Added checks for migration downtimemigration-downtime-tagsYorick Peterse2016-07-202-0/+130
* | | Ensure to_json methods take optional argumentSean McGivern2016-07-201-0/+24
| |/ |/|
* | Merge branch 'allow-deploy-key-to-download-public-projects' into 'master' Rémy Coutable2016-07-191-11/+61
|\ \
| * | Allow to pull code with deploy key from public projectsallow-deploy-key-to-download-public-projectsKamil Trzcinski2016-07-191-11/+61
| |/
* | Merge branch 'fix/import-export-project-avatar' into 'master' Rémy Coutable2016-07-192-0/+52
|\ \
| * | fix specJames Lopez2016-07-191-1/+1
| * | squashed - added avatar saver/restorer and specsfix/import-export-project-avatarJames Lopez2016-07-192-0/+52
| |/
* | Use value of `yaml_variables` and `when` from config_processor if undefinedKamil Trzcinski2016-07-191-1/+1
|/
* Squashed - fix encoding issuefix/import-export-encodingJames Lopez2016-07-193-11/+23
* Merge branch '19820-safer-diffs' into 'master' Douwe Maan2016-07-181-0/+14
|\
| * Collapsed diffs lines/size don't accumulate to overflow diffs.19820-safer-diffsPaco Guzman2016-07-181-0/+14
* | Revert "Revert "Merge branch '18193-developers-can-merge' into 'master' ""Rémy Coutable2016-07-183-134/+204
* | 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
| |/ |/|
* | Merge branch 'feature.rouge-20' into 'master' Robert Speicher2016-07-151-2/+2
|\ \
| * | 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
|/ /
* | Revert "Merge branch '18193-developers-can-merge' into 'master' "Robert Speicher2016-07-133-204/+134
* | Stub omniauth provider for GitLabgl-importer-keeps-issue-numberDouglas Barbosa Alexandre2016-07-131-1/+6
* | Add spec for GitLab.com importerDouglas Barbosa Alexandre2016-07-131-0/+48
* | Implement last round of review comments from !4892.18193-developers-can-mergeTimothy Andrew2016-07-131-21/+19
* | Appease rubocop.Timothy Andrew2016-07-131-1/+0
* | Refactor `Gitlab::GitAccess`Timothy Andrew2016-07-132-82/+90
* | Enforce "developers can merge" during `pre-receive`.Timothy Andrew2016-07-132-72/+116
* | Added "developers can merge" setting to protected branchesMathias Vestergaard2016-07-131-0/+21
* | Merge branch 'multi-line-inline-diff' into 'master' Douwe Maan2016-07-131-10/+18
|\ \
| * | Render inline diffs for multiple changed lines following eachotherDouwe Maan2016-07-111-10/+18
* | | Merge branch 'rs-describe-symbols' into 'master' Robert Speicher2016-07-125-6/+6
|\ \ \
| * | | Avoid `describe`-ing symbols in specsrs-describe-symbolsRobert Speicher2016-07-125-6/+6
* | | | Remove unnecessary context from GitHub client specDouglas Barbosa Alexandre2016-07-121-6/+4
* | | | Fix GItHub client requests when rate limit is disabledDouglas Barbosa Alexandre2016-07-121-0/+9
|/ / /
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-even...James Lopez2016-07-1149-172/+3184
|\ \ \ | | |/ | |/|
| * | Merge branch 'fix/remove-import-url-migration' into 'master' Rémy Coutable2016-07-111-0/+6
| |\ \ | | |/ | |/|
| | * spec and fix for sanitize methodJames Lopez2016-07-111-0/+6
| * | Merge branch '1548-average-commits-per-day' into 'master' Rémy Coutable2016-07-081-0/+39
| |\ \ | | |/ | |/|
| | * Infinity Bug in Commit StatisticsJonas Weber2016-05-201-0/+39
| * | Merge branch '18627-wildcard-branch-protection' into 'master' Douwe Maan2016-07-071-0/+70
| |\ \
| | * | Improve the error message displayed when branch creation fails.Timothy Andrew2016-07-051-0/+70
View Lorry Controller Status