summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'feature/improve-async-pipeline-processing' into 'master' Kamil Trzciński2016-10-061-1/+1
|\
| * Fix pipeline fixtures and calls to removed methodGrzegorz Bizon2016-10-041-1/+1
* | Merge remote-tracking branch 'dev/master'Rémy Coutable2016-10-062-0/+159
|\ \
| * \ Merge branch 'fix/id-claim-import-issue' into 'master' Douwe Maan2016-09-302-0/+159
| |\ \
| | * | Prevent claiming associated model IDs via import and added relevant specsJames Lopez2016-09-272-0/+159
* | | | Merge branch 'kradydal/gitlab-ce-20989-disable-all-for-non-project-members'Rémy Coutable2016-10-051-0/+9
|\ \ \ \
| * | | | Imrove grammarKatarzyna Kobierska2016-10-031-1/+1
| * | | | Fix test, add author attribute to all testsKatarzyna Kobierska2016-10-031-0/+9
| | |_|/ | |/| |
* | | | Merge branch 'test-improve-gitlab-identifier' into 'master' Rémy Coutable2016-10-051-0/+123
|\ \ \ \
| * | | | Refactor Gitlab::IdentifierYorick Peterse2016-10-051-0/+123
* | | | | Merge branch 'fix/22225' into 'master' Sean McGivern2016-10-041-2/+22
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Skip wiki creation when GitHub project has wiki enabledDouglas Barbosa Alexandre2016-10-041-2/+22
* | | | | Fixed banzai test failuresPhil Hughes2016-10-041-4/+4
|/ / / /
* | | | Merge branch 'rs-string-conversion-in-interpolation' into 'master' Rémy Coutable2016-10-031-1/+1
|\ \ \ \
| * | | | Enable Lint/StringConversionInInterpolation cop and autocorrect offensesrs-string-conversion-in-interpolationRobert Speicher2016-10-031-1/+1
| |/ / /
* | | | Merge branch '22466-task-list-fork' into 'master' Rémy Coutable2016-10-031-16/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Remove the task_list test since it is patched upstreamJared Deckard2016-09-301-16/+0
| |/ /
* | | Merge branch '21983-member-add_user-doesn-t-detect-existing-members-that-have...Robert Speicher2016-10-022-6/+6
|\ \ \ | |/ / |/| |
| * | Allow Member.add_user to handle access requestersRémy Coutable2016-09-282-6/+6
* | | Merge branch 'lfs-ssh-authorization-fix' into 'master' Douwe Maan2016-09-282-6/+6
|\ \ \
| * | | Handle LFS token creation and retrieval in the same method, and in the same R...lfs-ssh-authorization-fixPatricio Cano2016-09-282-6/+6
* | | | Log LDAP lookup errors and don't swallow unrelated exceptionsMarkus Koller2016-09-281-3/+34
| |/ / |/| |
* | | Import all GitHub comments after importing issues and PRsAhmad Sherif2016-09-271-0/+2
* | | Speed up label-applying process for GitHub importingAhmad Sherif2016-09-271-5/+6
* | | Process each page of GitHub resources instead of concating them then processingAhmad Sherif2016-09-271-1/+1
|/ /
* | fix model order in import/export config and 1to1 relation issue. Added releva...James Lopez2016-09-272-1/+43
|/
* added more specsJames Lopez2016-09-261-1/+1
* Fixes issue with rails reserved keyword type exporting/importing services. Al...James Lopez2016-09-263-0/+12
* Merge branch '22229-use-base-sha-when-downloading-merge-requests' into 'master' Robert Speicher2016-09-251-3/+37
|\
| * Use base SHA for patches and diffsNick Thomas2016-09-221-3/+37
* | Make Gitlab::Redis.params safe for mutationJacob Vosmaer2016-09-221-7/+45
* | fix import/export security specs after mergeJames Lopez2016-09-212-1/+12
* | fixing security specs after mergeJames Lopez2016-09-212-1/+22
* | Merge branch 'add_spec_for_committer_hash' into 'master' Rémy Coutable2016-09-211-0/+45
|\ \
| * | Add spec covering 'committer_hash'Dan Dunckel2016-09-201-0/+45
| |/
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-09-2113-51/+649
|\ \
| * | Improve JwtController implementationpost-merge-improve-of-ci-permissionsKamil Trzcinski2016-09-201-3/+5
| * | Post-merge improve of CI permissionsKamil Trzcinski2016-09-202-4/+10
| |/
| * Merge branch 'feature/github-edit-path' into 'master' Rémy Coutable2016-09-201-1/+1
| |\
| | * modify github import JS and controller so we can now specify a namespace and/...James Lopez2016-09-201-1/+1
| * | Merge branch 'lfs-support-for-ssh-enabled' into 'master' Douwe Maan2016-09-202-0/+69
| |\ \ | | |/ | |/|
| | * Fix test failureKamil Trzcinski2016-09-191-1/+1
| | * Revert "Revert all changes introduced by https://gitlab.com/gitlab-org/gitlab...lfs-supportKamil Trzcinski2016-09-192-0/+69
| * | Merge branch 'strip-key-comments-for-gitlab-shell' into 'master' Robert Speicher2016-09-201-4/+28
| |\ \
| | * | Strip comments before sending keys to gitlab-shellJacob Vosmaer2016-09-161-4/+28
| * | | Merge branch 'per-build-token-without-lfs' into 'master' Rémy Coutable2016-09-194-31/+191
| |\ \ \ | | | |/ | | |/|
| | * | Revert all changes introduced by https://gitlab.com/gitlab-org/gitlab-ce/merg...Kamil Trzcinski2016-09-192-69/+0
| | * | Merge branch 'master' into per-build-tokenKamil Trzcinski2016-09-194-44/+304
| | |\ \
| | * | | Fix spec failuresKamil Trzcinski2016-09-191-1/+1
| | * | | Don't leak build tokens in build logsKamil Trzcinski2016-09-191-0/+19