Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #8026 from HerrBerg/master | Dmitriy Zaporozhets | 2014-10-22 | 1 | -1/+1 |
|\ | |||||
| * | fix exclude wiki regex | HerrBerg | 2014-10-13 | 1 | -1/+1 |
* | | Merge pull request #8054 from bbodenmiller/patch-4 | Dmitriy Zaporozhets | 2014-10-22 | 1 | -8/+6 |
|\ \ | |||||
| * | | match latest config from https://cipherli.st/ | Ben Bodenmiller | 2014-10-15 | 1 | -8/+6 |
* | | | Make gitlab ldap check work for old and new syntax | Dmitriy Zaporozhets | 2014-10-22 | 1 | -2/+2 |
* | | | Merge branch 'fix-ldap-check' into 'master' | Dmitriy Zaporozhets | 2014-10-22 | 2 | -31/+15 |
|\ \ \ | |||||
| * | | | Fix rake gitlab:ldap:check | Dmitriy Zaporozhets | 2014-10-21 | 2 | -31/+15 |
* | | | | Merge pull request #8117 from cirosantilli/improve-grack-comment | Robert Schilling | 2014-10-21 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Improve grack auth hooks comment. | Ciro Santilli | 2014-10-21 | 1 | -1/+1 |
* | | | | | Merge branch 'qwazerty-hipchat_api' into 'master' | Dmitriy Zaporozhets | 2014-10-21 | 1 | -2/+36 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Merge branch 'hipchat_api' of https://github.com/qwazerty/gitlabhq into qwaze... | Dmitriy Zaporozhets | 2014-10-21 | 1 | -2/+36 |
| |\ \ \ \ | |||||
| | * | | | | Add Hipchat services API | Kevin Houdebert | 2014-10-14 | 1 | -2/+36 |
| | | |/ / | | |/| | | |||||
* | | | | | Merge pull request #7961 from cirosantilli/dry-log-file-names | Dmitriy Zaporozhets | 2014-10-21 | 5 | -4/+22 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Dry admin logs. | Ciro Santilli | 2014-10-06 | 5 | -4/+22 |
* | | | | | Merge pull request #8087 from cirosantilli/end_with | Dmitriy Zaporozhets | 2014-10-21 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Replace match with end_with: more readable, faster | Ciro Santilli | 2014-10-18 | 1 | -1/+1 |
* | | | | | Merge branch 'empty_wiki_backup_check' into 'master' | Dmitriy Zaporozhets | 2014-10-20 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Ask the wiki repo, not Gollum, if it's empty | Jacob Vosmaer | 2014-10-20 | 1 | -1/+1 |
* | | | | | | Merge branch 'security-api-internal-publicity' into 'master' | Dmitriy Zaporozhets | 2014-10-20 | 2 | -0/+12 |
|\ \ \ \ \ \ | |||||
| * | | | | | | add gitlab-shell identification | Valery Sizov | 2014-10-15 | 2 | -0/+12 |
* | | | | | | | Merge pull request #7856 from cirosantilli/error-to-msg | Dmitriy Zaporozhets | 2014-10-20 | 1 | -3/+3 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Use :message key, not :error for File::Service. | Ciro Santilli | 2014-10-13 | 1 | -3/+3 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #8058 from bbodenmiller/patch-14 | Robert Schilling | 2014-10-18 | 1 | -2/+1 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | simplify DHE parameter generation | Ben Bodenmiller | 2014-10-16 | 1 | -2/+1 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Fix account existing blocking | Dmitriy Zaporozhets | 2014-10-17 | 1 | -9/+23 |
* | | | | | Add regressiontest to verify allow_single_sign_on setting | Jan-Willem van der Meer | 2014-10-16 | 1 | -3/+14 |
|/ / / / | |||||
* | | | | Use Hash syntax for LDAP server declaration | Jan-Willem van der Meer | 2014-10-14 | 1 | -3/+3 |
* | | | | Remove unused methods | Jan-Willem van der Meer | 2014-10-14 | 2 | -12/+0 |
* | | | | Add explaining note to authentication method [skip ci] | Jan-Willem van der Meer | 2014-10-14 | 1 | -0/+2 |
* | | | | Use server specific uid | Jan-Willem van der Meer | 2014-10-14 | 1 | -1/+1 |
* | | | | Make sure the filters are applied | Jan-Willem van der Meer | 2014-10-14 | 1 | -8/+9 |
* | | | | Fix authorization for LDAP login | Jan-Willem van der Meer | 2014-10-14 | 2 | -1/+5 |
* | | | | DRY find method to find Gitlab user | Jan-Willem van der Meer | 2014-10-14 | 1 | -4/+2 |
* | | | | Remove unused method | Jan-Willem van der Meer | 2014-10-14 | 1 | -8/+0 |
* | | | | Refactor lib files for multiple LDAP groups | Jan-Willem van der Meer | 2014-10-13 | 7 | -114/+252 |
|/ / / | |||||
* | | | Merge branch 'feature-oauth-refactoring' into 'master' | Dmitriy Zaporozhets | 2014-10-13 | 3 | -70/+78 |
|\ \ \ | |||||
| * | | | Refactor OAuth refactorings to CE | Jan-Willem van der Meer | 2014-10-10 | 3 | -70/+78 |
| |/ / | |||||
* | | | Merge branch 'bug_with_apostrophe' into 'master' | Dmitriy Zaporozhets | 2014-10-12 | 1 | -0/+12 |
|\ \ \ | |||||
| * | | | Add a comment why this is done. | Marin Jankovski | 2014-10-10 | 1 | -0/+6 |
| * | | | Substitute right single quote back with apostrophe. | Marin Jankovski | 2014-10-10 | 1 | -0/+1 |
| * | | | Replace apostrophe with right single quote to avoid markdown interpretation a... | Marin Jankovski | 2014-10-09 | 1 | -0/+5 |
* | | | | Merge branch 'enabling_markdown_pipelines_from_gitlab' into 'master' | Dmitriy Zaporozhets | 2014-10-12 | 1 | -5/+13 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Make sure relative url and asset_host are honored, specs. | Marin Jankovski | 2014-10-10 | 1 | -1/+6 |
| * | | | Enable markdown pipeline filters from inside gitlab. | Marin Jankovski | 2014-10-09 | 1 | -8/+11 |
| |/ / | |||||
* | | | Add a comment on why we are using backward compatible ciphers. | Marin Jankovski | 2014-10-10 | 1 | -3/+4 |
* | | | Revert "update ssl_ciphers" | Marin Jankovski | 2014-10-10 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #7988 from marcaube/patch-1 | Robert Schilling | 2014-10-08 | 1 | -1/+4 |
|\ \ | |||||
| * | | Update import.rake | Marc Aubé | 2014-10-07 | 1 | -1/+4 |
* | | | Improve wiki path parsing in internal api | Dmitriy Zaporozhets | 2014-10-07 | 1 | -1/+1 |
* | | | Developers can push to wiki repo. Protected branches does not affect wiki rep... | Dmitriy Zaporozhets | 2014-10-07 | 3 | -22/+41 |
|/ / |