summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'create-hooks' into 'master'Dmitriy Zaporozhets2014-09-082-3/+3
|\
| * Use create-hooks instead of rewrite-hooks.shJacob Vosmaer2014-09-082-3/+3
* | Merge pull request #7583 from bbodenmiller/httpsSytse Sijbrandij2014-09-081-12/+1
|\ \
| * | simplify HTTPS setup detailsBen Bodenmiller2014-09-071-12/+1
| |/
* | Merge pull request #7580 from bbodenmiller/patch-7Sytse Sijbrandij2014-09-081-0/+17
|\ \ | |/ |/|
| * add optional nginx configs to make more secureBen Bodenmiller2014-09-071-0/+17
* | Fix tests for CIDmitriy Zaporozhets2014-09-061-1/+1
* | Merge pull request #7470 from bbodenmiller/patch-1Dmitriy Zaporozhets2014-09-051-4/+4
|\ \
| * | change git to git bin pathBen Bodenmiller2014-08-301-4/+4
| |/
* | Fix tag testsDmitriy Zaporozhets2014-09-051-0/+1
* | Explicit issues order in API. Fixes tests for mysql. Again :)Dmitriy Zaporozhets2014-09-041-1/+3
* | Added annotated tags. Updated tag haml file and call to gitlab-shell. Updat...Sean Edge2014-09-042-3/+11
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2014-09-041-3/+24
|\ \
| * | Filters issues by labels via APIjubianchi2014-09-041-3/+24
* | | Merge pull request #7382 from Razer6/git_ref_validationDmitriy Zaporozhets2014-09-043-8/+32
|\ \ \ | |/ / |/| |
| * | Validate tag-names and references in WebUI, APIRobert Schilling2014-09-031-4/+9
| * | Validate branch-names and references in WebUI, APIRobert Schilling2014-09-032-4/+23
* | | Explicit order of issues in API. Fixes specs for mysql dbDmitriy Zaporozhets2014-09-031-1/+1
* | | Merge branch 'internal-api-post' into 'master'Dmitriy Zaporozhets2014-09-031-1/+3
|\ \ \ | |/ / |/| |
| * | Make sure /api/allowed return 200 status codeDmitriy Zaporozhets2014-09-031-0/+2
| * | /api/allowed use POST nowDmitriy Zaporozhets2014-09-031-1/+1
* | | Merge branch 'feaure-ldap-oauth-tests'Dmitriy Zaporozhets2014-09-034-9/+4
|\ \ \ | |/ / |/| |
| * | Refactor: beter naming for active directory disabled usersJan-Willem van der Meer2014-09-012-2/+2
| * | Get uid from auth instead of info hashJan-Willem van der Meer2014-09-011-3/+1
| * | Remove duplicate methodJan-Willem van der Meer2014-09-011-4/+0
| * | Ensure oath callbacks without a nickname work (google)Jan-Willem van der Meer2014-09-011-0/+1
| * | Handle user creation if email is not providedJan-Willem van der Meer2014-09-011-0/+1
| * | Add tests for finding an oauth authenticated userJan-Willem van der Meer2014-09-011-1/+1
| |/
* | Refactor finders. Prevent circular dependency errorDmitriy Zaporozhets2014-09-021-3/+3
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-09-021-0/+1
|\ \
| * \ Merge pull request #7663 from Razer6/all_is_not_a_valid_userDmitriy Zaporozhets2014-09-021-0/+1
| |\ \
| | * | 'all' is not a valid usernameRobert Schilling2014-09-011-0/+1
| | |/
* | | Merge branch 'gitlab-shell-2-0' into 'master'Dmitriy Zaporozhets2014-09-022-12/+32
|\ \ \ | |/ / |/| |
| * | Rewrite GitAccess for gitlab-shell v2Dmitriy Zaporozhets2014-09-012-12/+32
| |/
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-09-021-4/+23
|\ \
| * | Filters issues by state via APIjubianchi2014-09-011-4/+23
| |/
* | Handle user creation if email is not providedJan-Willem van der Meer2014-09-011-0/+1
|/
* Merge branch 'feature-ldap-tests' into 'master'Dmitriy Zaporozhets2014-08-301-1/+2
|\
| * Move and rename ldap / oauth specsJan-Willem van der Meer2014-08-291-1/+2
* | Remove LDAP::Access#find_userJacob Vosmaer2014-08-291-16/+1
* | block visibility level restriction override in controllerJob van der Voort2014-08-281-1/+15
|/
* Merge pull request #7378 from jojosch/nginx-ssl-redirectDmitriy Zaporozhets2014-08-281-1/+1
|\
| * Use a ? after the $request_uri to perform a valid Redirect while cloning.johannes2014-08-231-1/+1
* | Fix testsDmitriy Zaporozhets2014-08-272-2/+2
* | Search by issue/mr title and descriptionDmitriy Zaporozhets2014-08-271-2/+2
* | Pass scope and page to Gitlab::SearchResults#objects instead of initializeDmitriy Zaporozhets2014-08-272-21/+5
* | Search results libraries addedDmitriy Zaporozhets2014-08-262-0/+137
* | Write authorized_keys in tmp/tests during testsJacob Vosmaer2014-08-261-1/+1
* | Merge branch 'drop_post_recieve_jobs' into 'master'Dmitriy Zaporozhets2014-08-251-0/+47
|\ \
| * | Add rake task to drop a project's PostReceive jobsJacob Vosmaer2014-08-211-0/+47