summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8005 from cirosantilli/settings-to-gitlab-configDmitriy Zaporozhets2014-10-272-4/+4
|\
| * Use Gitlab.config instead of Settings everywhereCiro Santilli2014-10-152-4/+4
* | Merge pull request #8158 from cirosantilli/basename-dirname-splitRobert Schilling2014-10-251-2/+1
|\ \
| * | Merge File basename and direname into splitCiro Santilli2014-10-231-2/+1
* | | Merge pull request #8159 from cirosantilli/fix-rake-import-existing-groupJacob Vosmaer2014-10-241-10/+2
|\ \ \
| * | | Fix import.rake failed import if project name isCiro Santilli2014-10-241-10/+2
* | | | Fix LDAP config lookup for provider 'ldap'Jacob Vosmaer2014-10-231-11/+16
|/ / /
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqMarin Jankovski2014-10-231-2/+2
|\ \ \
| * | | Fix LDAP authentication for Git HTTP accessJacob Vosmaer2014-10-231-2/+2
* | | | Merge pull request #8150 from cirosantilli/unecessary-variable-userRobert Schilling2014-10-231-1/+1
|\ \ \ \
| * | | | Remove unused variable user at lib/gitlab/markdownCiro Santilli2014-10-231-1/+1
| | |/ / | |/| |
* | | | Merge pull request #8088 from cirosantilli/sh-str-to-argsJacob Vosmaer2014-10-231-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Use argument list for sh instead of stringCiro Santilli2014-10-181-1/+1
* | | | Merge pull request #8026 from HerrBerg/masterDmitriy Zaporozhets2014-10-221-1/+1
|\ \ \ \
| * | | | fix exclude wiki regexHerrBerg2014-10-131-1/+1
* | | | | Merge pull request #8054 from bbodenmiller/patch-4Dmitriy Zaporozhets2014-10-221-8/+6
|\ \ \ \ \
| * | | | | match latest config from https://cipherli.st/Ben Bodenmiller2014-10-151-8/+6
| | |_|_|/ | |/| | |
* | | | | Make gitlab ldap check work for old and new syntaxDmitriy Zaporozhets2014-10-221-2/+2
* | | | | Merge branch 'fix-ldap-check' into 'master'Dmitriy Zaporozhets2014-10-222-31/+15
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix rake gitlab:ldap:checkDmitriy Zaporozhets2014-10-212-31/+15
* | | | | Merge pull request #8117 from cirosantilli/improve-grack-commentRobert Schilling2014-10-211-1/+1
|\ \ \ \ \
| * | | | | Improve grack auth hooks comment.Ciro Santilli2014-10-211-1/+1
* | | | | | Merge branch 'qwazerty-hipchat_api' into 'master'Dmitriy Zaporozhets2014-10-211-2/+36
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Merge branch 'hipchat_api' of https://github.com/qwazerty/gitlabhq into qwaze...Dmitriy Zaporozhets2014-10-211-2/+36
| |\ \ \ \ \
| | * | | | | Add Hipchat services APIKevin Houdebert2014-10-141-2/+36
| | | |/ / / | | |/| | |
* | | | | | Merge pull request #7961 from cirosantilli/dry-log-file-namesDmitriy Zaporozhets2014-10-215-4/+22
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Dry admin logs.Ciro Santilli2014-10-065-4/+22
* | | | | | Merge pull request #8087 from cirosantilli/end_withDmitriy Zaporozhets2014-10-211-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Replace match with end_with: more readable, fasterCiro Santilli2014-10-181-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'empty_wiki_backup_check' into 'master'Dmitriy Zaporozhets2014-10-201-1/+1
|\ \ \ \ \
| * | | | | Ask the wiki repo, not Gollum, if it's emptyJacob Vosmaer2014-10-201-1/+1
* | | | | | Merge branch 'security-api-internal-publicity' into 'master'Dmitriy Zaporozhets2014-10-202-0/+12
|\ \ \ \ \ \
| * | | | | | add gitlab-shell identificationValery Sizov2014-10-152-0/+12
* | | | | | | Merge pull request #7856 from cirosantilli/error-to-msgDmitriy Zaporozhets2014-10-201-3/+3
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Use :message key, not :error for File::Service.Ciro Santilli2014-10-131-3/+3
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #8058 from bbodenmiller/patch-14Robert Schilling2014-10-181-2/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | simplify DHE parameter generationBen Bodenmiller2014-10-161-2/+1
| | |_|_|/ | |/| | |
* | | | | Fix account existing blockingDmitriy Zaporozhets2014-10-171-9/+23
* | | | | Add regressiontest to verify allow_single_sign_on settingJan-Willem van der Meer2014-10-161-3/+14
|/ / / /
* | | | Use Hash syntax for LDAP server declarationJan-Willem van der Meer2014-10-141-3/+3
* | | | Remove unused methodsJan-Willem van der Meer2014-10-142-12/+0
* | | | Add explaining note to authentication method [skip ci]Jan-Willem van der Meer2014-10-141-0/+2
* | | | Use server specific uidJan-Willem van der Meer2014-10-141-1/+1
* | | | Make sure the filters are appliedJan-Willem van der Meer2014-10-141-8/+9
* | | | Fix authorization for LDAP loginJan-Willem van der Meer2014-10-142-1/+5
* | | | DRY find method to find Gitlab userJan-Willem van der Meer2014-10-141-4/+2
* | | | Remove unused methodJan-Willem van der Meer2014-10-141-8/+0
* | | | Refactor lib files for multiple LDAP groupsJan-Willem van der Meer2014-10-137-114/+252
|/ / /
* | | Merge branch 'feature-oauth-refactoring' into 'master'Dmitriy Zaporozhets2014-10-133-70/+78
|\ \ \
| * | | Refactor OAuth refactorings to CEJan-Willem van der Meer2014-10-103-70/+78
| |/ /
View Lorry Controller Status