summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-10-301-15/+18
|\
| * Create RepoTag Grape entity and present it when doing stuff with tags via API...Sean Edge2014-10-301-15/+18
* | Merge branch 'notify-on-mention-everywhere' into 'master'Dmitriy Zaporozhets2014-10-301-0/+14
|\ \
| * | Mentioned users are not limited by project scope any moreDmitriy Zaporozhets2014-10-301-0/+14
* | | Merge branch 'feature_password_strength_indicator' into 'master'Dmitriy Zaporozhets2014-10-301-1/+1
|\ \ \ | |/ / |/| |
| * | Updated the IDs of the fields, so that it wouldn't mess with many testsPatricio Cano2014-10-221-1/+1
* | | Merge branch 'improve-group-members-api' into 'master'Valery Sizov2014-10-292-110/+136
|\ \ \ | |_|/ |/| |
| * | Dont allow guests..developers to manage group membersDmitriy Zaporozhets2014-10-291-3/+9
| * | Split group members apiDmitriy Zaporozhets2014-10-292-124/+130
| * | Add failing test that should be green after group members api get fixedDmitriy Zaporozhets2014-10-281-3/+17
| |/
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2014-10-281-11/+9
|\ \
| * \ Merge branch 'transfer-service-spec-cleanups' into 'master'Dmitriy Zaporozhets2014-10-281-11/+9
| |\ \
| | * | transfer_service_spec: cleanup, merge common code, check against nilBernhard Kaindl2014-10-041-11/+9
* | | | Fix testsDmitriy Zaporozhets2014-10-281-9/+11
|/ / /
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2014-10-284-2/+51
|\ \ \
| * \ \ Merge branch 'disable_email_option' into 'master'Dmitriy Zaporozhets2014-10-281-0/+26
| |\ \ \
| | * | | Add a comment in interceptor spec.Marin Jankovski2014-10-271-0/+3
| | * | | Add interceptor test.Marin Jankovski2014-10-271-0/+23
| * | | | Merge branch 'master' into 7-4-stableValery Sizov2014-10-273-6/+38
| |\ \ \ \ | | |/ / /
| | * | | Fix LDAP config lookup for provider 'ldap'Jacob Vosmaer2014-10-231-1/+15
| | * | | Merge pull request #8053 from mr-vinn/fix-rspec-urlRobert Schilling2014-10-231-1/+3
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Use actual GitLab URL for test assertionVinnie Okada2014-10-181-1/+3
| | | * | Fix Rspec error when using non-default portVinnie Okada2014-10-161-1/+1
| * | | | internal snippets: fix exposing of titleValery Sizov2014-10-241-0/+7
| * | | | Fix LDAP config lookup for provider 'ldap'Jacob Vosmaer2014-10-241-1/+15
| * | | | Add test for allowed team name of slack.Marin Jankovski2014-10-211-0/+20
* | | | | Merge branch 'api-project-delete' of https://gitlab.com/mr-vinn/gitlab-ce int...Dmitriy Zaporozhets2014-10-282-0/+14
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Remove :keep_repo optionVinnie Okada2014-10-221-10/+0
| * | | | Add option to keep repo on project deleteVinnie Okada2014-10-072-1/+21
* | | | | Merge branch 'slack_team_name' into 'master'Valery Sizov2014-10-211-0/+20
|\ \ \ \ \
| * | | | | Add test for allowed team name of slack.Marin Jankovski2014-10-211-0/+20
* | | | | | Merge branch 'hipchat_api' of https://github.com/qwazerty/gitlabhq into qwaze...Dmitriy Zaporozhets2014-10-211-0/+26
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add Hipchat services APIKevin Houdebert2014-10-141-0/+26
| | |_|/ / | |/| | |
* | | | | Merge branch 'security-api-internal-publicity' into 'master'Dmitriy Zaporozhets2014-10-201-5/+9
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | add gitlab-shell identificationValery Sizov2014-10-151-5/+9
* | | | | Fix account existing blockingDmitriy Zaporozhets2014-10-171-10/+66
* | | | | Add regressiontest to verify allow_single_sign_on settingJan-Willem van der Meer2014-10-161-11/+8
* | | | | Remove LDAP save testJan-Willem van der Meer2014-10-161-8/+8
| |/ / / |/| | |
* | | | Add specs for authentication and configJan-Willem van der Meer2014-10-142-0/+73
* | | | Merge tests to support Multiple LDAP groupsJan-Willem van der Meer2014-10-135-24/+31
* | | | Refactor lib files for multiple LDAP groupsJan-Willem van der Meer2014-10-131-16/+10
* | | | Merge branch 'sorting-users-in-admin' into 'master'Dmitriy Zaporozhets2014-10-131-0/+28
|\ \ \ \
| * | | | Admin: user sortingValery Sizov2014-10-131-0/+28
| |/ / /
* | | | Merge branch 'feature-oauth-refactoring' into 'master'Dmitriy Zaporozhets2014-10-133-69/+94
|\ \ \ \
| * | | | Refactor OAuth refactorings to CEJan-Willem van der Meer2014-10-103-69/+94
| |/ / /
* | | | Merge pull request #8020 from mr-vinn/note-trunc-linkDmitriy Zaporozhets2014-10-131-0/+52
|\ \ \ \
| * | | | Improve dashboard note view and add testsVinnie Okada2014-10-121-0/+52
* | | | | Merge branch 'ambiguous-sha' into 'master'fondevDmitriy Zaporozhets2014-10-124-10/+9
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix testsDmitriy Zaporozhets2014-10-121-1/+1
| * | | | Fix testsDmitriy Zaporozhets2014-10-101-2/+2