Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'fix_internal_snippets' into '7-4-stable'v7.4.2 | Jacob Vosmaer | 2014-10-24 | 4 | -1/+15 |
|\ | |||||
| * | internal snippets: fix exposing of title | Valery Sizov | 2014-10-24 | 4 | -1/+15 |
|/ | |||||
* | Bump to 7.4.1v7.4.1 | Valery Sizov | 2014-10-24 | 1 | -1/+1 |
* | Bump gitlab_git to 7.0.0.rc10 (submodules fix) | Jacob Vosmaer | 2014-10-24 | 2 | -3/+3 |
* | Fix LDAP config lookup for provider 'ldap' | Jacob Vosmaer | 2014-10-24 | 3 | -12/+32 |
* | fix for public snippet | Valery Sizov | 2014-10-24 | 5 | -2/+33 |
* | Fix LDAP authentication for Git HTTP access | Jacob Vosmaer | 2014-10-23 | 2 | -2/+5 |
* | Version 7.4.0.v7.4.0 | Marin Jankovski | 2014-10-22 | 1 | -1/+1 |
* | Merge branch 'fix-500-login-disabled' into 'master' | Marin Jankovski | 2014-10-22 | 1 | -10/+10 |
* | Merge branch 'stable-fix-ldap-check' into '7-4-stable' | Dmitriy Zaporozhets | 2014-10-22 | 2 | -31/+15 |
|\ | |||||
| * | Make gitlab ldap check work for old and new syntax | Dmitriy Zaporozhets | 2014-10-22 | 1 | -2/+2 |
| * | Fix rake gitlab:ldap:check | Dmitriy Zaporozhets | 2014-10-22 | 2 | -31/+15 |
* | | Update Guide: Change path to nginx config | Valery Sizov | 2014-10-21 | 2 | -3/+3 |
* | | Add test for allowed team name of slack. | Marin Jankovski | 2014-10-21 | 1 | -0/+20 |
* | | Use allowed slack team name. | Marin Jankovski | 2014-10-21 | 1 | -1/+2 |
* | | remove unnecessary parts from update doc | Valery Sizov | 2014-10-21 | 1 | -33/+4 |
* | | Merge branch 'error-messages-fix' into '7-4-stable' | Valery Sizov | 2014-10-21 | 7 | -11/+42 |
|\ \ | |||||
| * | | Use :message key, not :error for File::Service. | Ciro Santilli | 2014-10-21 | 7 | -11/+42 |
| |/ | |||||
* | | Merge pull request #8065 from bbodenmiller/patch-17 | Valeriy Sizov | 2014-10-21 | 1 | -1/+1 |
|\ \ | |||||
| * | | clarify when database.yml needs to be updated | Ben Bodenmiller | 2014-10-18 | 1 | -1/+1 |
* | | | Merge pull request #8066 from bbodenmiller/patch-18 | Valeriy Sizov | 2014-10-21 | 1 | -0/+6 |
|\ \ \ | |||||
| * | | | stop gitlab before mysql optimizations, run checks | Ben Bodenmiller | 2014-10-18 | 1 | -0/+6 |
| |/ / | |||||
* | | | Merge pull request #8067 from bbodenmiller/patch-19 | Valeriy Sizov | 2014-10-21 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | actually give command necessary to update unicorn | Ben Bodenmiller | 2014-10-18 | 1 | -2/+2 |
| |/ / | |||||
* | | | Merge pull request #8070 from bbodenmiller/patch-22 | Valeriy Sizov | 2014-10-21 | 2 | -14/+10 |
|\ \ \ | |||||
| * | | | stop gitlab before backup | Ben Bodenmiller | 2014-10-18 | 1 | -5/+5 |
| * | | | stop gitlab before backup | Ben Bodenmiller | 2014-10-18 | 1 | -9/+5 |
| |/ / | |||||
* | | | Merge pull request #8071 from bbodenmiller/patch-7 | Valeriy Sizov | 2014-10-21 | 1 | -0/+2 |
|\ \ \ | |||||
| * | | | add missing configure Redis to use sockets | Ben Bodenmiller | 2014-10-18 | 1 | -0/+2 |
| |/ / | |||||
* | | | Merge pull request #8072 from bbodenmiller/patch-12 | Valeriy Sizov | 2014-10-21 | 1 | -0/+70 |
|\ \ \ | |_|/ |/| | | |||||
| * | | add optimizations for mysql to 6.x->7.4 guide | Ben Bodenmiller | 2014-10-18 | 1 | -0/+70 |
| |/ | |||||
* | | Merge branch 'fixes-from-master' into '7-4-stable' | Valery Sizov | 2014-10-20 | 7 | -7/+35 |
|\ \ | |/ |/| | |||||
| * | Default the LDAP server label to LDAP | Jan-Willem van der Meer | 2014-10-20 | 1 | -1/+1 |
| * | Prevent redeclaration of LDAP strategy | Jan-Willem van der Meer | 2014-10-20 | 1 | -1/+2 |
| * | Add tests for remove group member feature in admin area | Dmitriy Zaporozhets | 2014-10-20 | 4 | -3/+30 |
| * | Fix group user removal from admin area | 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 'master' into '7-4-stable' | Dmitriy Zaporozhets | 2014-10-17 | 3 | -34/+117 |
|\ | |||||
| * | Merge branch 'fix-oauth-block' into 'master' | Dmitriy Zaporozhets | 2014-10-17 | 2 | -19/+89 |
| |\ | |||||
| | * | Fix account existing blocking | Dmitriy Zaporozhets | 2014-10-17 | 2 | -19/+89 |
| |/ | |||||
| * | Refactor error message a bit | Dmitriy Zaporozhets | 2014-10-17 | 1 | -2/+10 |
| * | Merge branch 'issue-respect-single-sign-on' into 'master' | Dmitriy Zaporozhets | 2014-10-17 | 3 | -23/+28 |
| |\ | |||||
| | * | Add regressiontest to verify allow_single_sign_on setting | Jan-Willem van der Meer | 2014-10-16 | 3 | -22/+27 |
| | * | Remove LDAP save test | Jan-Willem van der Meer | 2014-10-16 | 1 | -8/+8 |
* | | | documents updated | Valery Sizov | 2014-10-17 | 4 | -19/+159 |
|/ / | |||||
* | | Fix snippets seeds | Dmitriy Zaporozhets | 2014-10-16 | 1 | -8/+26 |
* | | Merge branch 'add_some_stuff_to_changelog' into 'master' | Dmitriy Zaporozhets | 2014-10-16 | 1 | -0/+7 |
|\ \ | |||||
| * | | Add items to changelog | Valery Sizov | 2014-10-16 | 1 | -0/+7 |
* | | | Merge branch 'issue-respect-single-sign-on' into 'master' | Dmitriy Zaporozhets | 2014-10-16 | 1 | -2/+6 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Disallow new users from Oauth signup if `allow_single_sign_on` is disabled | Jan-Willem van der Meer | 2014-10-16 | 1 | -2/+6 |
|/ |