summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Different created_at and updated_at time in api merge_requests spec.Marin Jankovski2014-09-151-31/+55
* Ordering and sorting for MR in api.Marin Jankovski2014-09-151-0/+32
* Fix diff_helper spec.Marin Jankovski2014-09-121-26/+27
* Merge remote-tracking branch 'origin/master' into feature-oauth-refactoringJan-Willem van der Meer2014-09-1115-54/+396
|\
| * Merge pull request #7705 from dblessing/serialize_service_propertiesDmitriy Zaporozhets2014-09-107-37/+6
| |\
| | * Serialize services propertiesDrew Blessing2014-09-107-37/+6
| * | Merge branch 'parallel_diff_refactor' into 'master'Dmitriy Zaporozhets2014-09-093-0/+212
| |\ \
| | * | Add diff_helper spec.Marin Jankovski2014-09-091-0/+98
| | * | Refactoring inside refactoring. We need to go deeperDmitriy Zaporozhets2014-09-082-8/+2
| | * | Specs for diff parser! Yay!Dmitriy Zaporozhets2014-09-082-0/+120
| | |/
| * | API: Create project - make sure project path is respectedDmitriy Zaporozhets2014-09-091-1/+1
| |/
| * Fix tests for CIDmitriy Zaporozhets2014-09-061-11/+12
| * Fix tests by using non-exist tag namesDmitriy Zaporozhets2014-09-051-5/+5
| * Fix tag testsDmitriy Zaporozhets2014-09-051-2/+3
| * Added annotated tags. Updated tag haml file and call to gitlab-shell. Updat...Sean Edge2014-09-041-6/+23
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2014-09-041-1/+64
| |\
| | * Filters issues by labels via APIjubianchi2014-09-041-1/+64
| * | Merge pull request #7382 from Razer6/git_ref_validationDmitriy Zaporozhets2014-09-043-10/+89
| |\ \ | | |/ | |/|
| | * Validate tag-names and references in WebUI, APIRobert Schilling2014-09-031-4/+30
| | * Validate branch-names and references in WebUI, APIRobert Schilling2014-09-032-6/+59
* | | Test authenticate method for Gitlab::LDAP::UserJan-Willem van der Meer2014-09-081-0/+16
* | | Ensure Gitlab::LDAP::authentication is testedJan-Willem van der Meer2014-09-081-0/+17
* | | Refactor gitlab auth testsJan-Willem van der Meer2014-09-081-11/+13
* | | Move auth hash to a seperate classJan-Willem van der Meer2014-09-041-4/+4
|/ /
* | Merge branch 'internal-api-post' into 'master'Dmitriy Zaporozhets2014-09-031-3/+3
|\ \ | |/ |/|
| * /api/allowed use POST nowDmitriy Zaporozhets2014-09-031-3/+3
* | Merge pull request #7533 from duk3luk3/system-hook-key-featureDmitriy Zaporozhets2014-09-031-0/+5
|\ \
| * | Add system hook for ssh key changesLukas Erlacher2014-09-031-0/+5
| |/
* | Merge branch 'feaure-ldap-oauth-tests'Dmitriy Zaporozhets2014-09-033-49/+67
|\ \ | |/ |/|
| * Refactor: beter naming for active directory disabled usersJan-Willem van der Meer2014-09-011-4/+4
| * Get uid from auth instead of info hashJan-Willem van der Meer2014-09-011-9/+8
| * Add basic find / create specs for LDAP userJan-Willem van der Meer2014-09-011-30/+22
| * Ensure oath callbacks without a nickname work (google)Jan-Willem van der Meer2014-09-011-0/+12
| * Handle user creation if email is not providedJan-Willem van der Meer2014-09-011-0/+12
| * Use local vars for testsJan-Willem van der Meer2014-09-011-6/+6
| * Add tests for finding an oauth authenticated userJan-Willem van der Meer2014-09-011-11/+26
* | Merge branch 'gitlab-shell-2-0' into 'master'Dmitriy Zaporozhets2014-09-022-6/+8
|\ \
| * | Fix specs for internal apiDmitriy Zaporozhets2014-09-021-2/+1
| * | Fix post-receive specsDmitriy Zaporozhets2014-09-021-4/+7
| |/
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-09-021-0/+26
|\ \
| * | Filters issues by state via APIjubianchi2014-09-011-0/+26
| |/
* | Handle user creation if email is not providedJan-Willem van der Meer2014-09-011-0/+12
|/
* Merge branch 'feature-ldap-tests' into 'master'Dmitriy Zaporozhets2014-08-305-1/+1
|\
| * Move and rename ldap / oauth specsJan-Willem van der Meer2014-08-293-1/+1
| * Rename ldap tests even furtherJan-Willem van der Meer2014-08-291-0/+0
| * Fix naming convention of LDAP testsJan-Willem van der Meer2014-08-293-0/+0
* | Remove LDAP::Access#find_userJacob Vosmaer2014-08-291-12/+0
* | block visibility level restriction override in controllerJob van der Voort2014-08-281-1/+1
|/
* Fix testsDmitriy Zaporozhets2014-08-271-4/+4
* Merge branch 'annotate' into 'master'Dmitriy Zaporozhets2014-08-259-0/+120
|\