summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix_internal_snippets' into '7-4-stable'v7.4.2Jacob Vosmaer2014-10-244-1/+15
|\
| * internal snippets: fix exposing of titleValery Sizov2014-10-244-1/+15
|/
* Bump to 7.4.1v7.4.1Valery Sizov2014-10-241-1/+1
* Bump gitlab_git to 7.0.0.rc10 (submodules fix)Jacob Vosmaer2014-10-242-3/+3
* Fix LDAP config lookup for provider 'ldap'Jacob Vosmaer2014-10-243-12/+32
* fix for public snippetValery Sizov2014-10-245-2/+33
* Fix LDAP authentication for Git HTTP accessJacob Vosmaer2014-10-232-2/+5
* Version 7.4.0.v7.4.0Marin Jankovski2014-10-221-1/+1
* Merge branch 'fix-500-login-disabled' into 'master'Marin Jankovski2014-10-221-10/+10
* Merge branch 'stable-fix-ldap-check' into '7-4-stable'Dmitriy Zaporozhets2014-10-222-31/+15
|\
| * Make gitlab ldap check work for old and new syntaxDmitriy Zaporozhets2014-10-221-2/+2
| * Fix rake gitlab:ldap:checkDmitriy Zaporozhets2014-10-222-31/+15
* | Update Guide: Change path to nginx configValery Sizov2014-10-212-3/+3
* | Add test for allowed team name of slack.Marin Jankovski2014-10-211-0/+20
* | Use allowed slack team name.Marin Jankovski2014-10-211-1/+2
* | remove unnecessary parts from update docValery Sizov2014-10-211-33/+4
* | Merge branch 'error-messages-fix' into '7-4-stable'Valery Sizov2014-10-217-11/+42
|\ \
| * | Use :message key, not :error for File::Service.Ciro Santilli2014-10-217-11/+42
| |/
* | Merge pull request #8065 from bbodenmiller/patch-17Valeriy Sizov2014-10-211-1/+1
|\ \
| * | clarify when database.yml needs to be updatedBen Bodenmiller2014-10-181-1/+1
* | | Merge pull request #8066 from bbodenmiller/patch-18Valeriy Sizov2014-10-211-0/+6
|\ \ \
| * | | stop gitlab before mysql optimizations, run checksBen Bodenmiller2014-10-181-0/+6
| |/ /
* | | Merge pull request #8067 from bbodenmiller/patch-19Valeriy Sizov2014-10-211-2/+2
|\ \ \
| * | | actually give command necessary to update unicornBen Bodenmiller2014-10-181-2/+2
| |/ /
* | | Merge pull request #8070 from bbodenmiller/patch-22Valeriy Sizov2014-10-212-14/+10
|\ \ \
| * | | stop gitlab before backupBen Bodenmiller2014-10-181-5/+5
| * | | stop gitlab before backupBen Bodenmiller2014-10-181-9/+5
| |/ /
* | | Merge pull request #8071 from bbodenmiller/patch-7Valeriy Sizov2014-10-211-0/+2
|\ \ \
| * | | add missing configure Redis to use socketsBen Bodenmiller2014-10-181-0/+2
| |/ /
* | | Merge pull request #8072 from bbodenmiller/patch-12Valeriy Sizov2014-10-211-0/+70
|\ \ \ | |_|/ |/| |
| * | add optimizations for mysql to 6.x->7.4 guideBen Bodenmiller2014-10-181-0/+70
| |/
* | Merge branch 'fixes-from-master' into '7-4-stable'Valery Sizov2014-10-207-7/+35
|\ \ | |/ |/|
| * Default the LDAP server label to LDAPJan-Willem van der Meer2014-10-201-1/+1
| * Prevent redeclaration of LDAP strategyJan-Willem van der Meer2014-10-201-1/+2
| * Add tests for remove group member feature in admin areaDmitriy Zaporozhets2014-10-204-3/+30
| * Fix group user removal from admin areaDmitriy Zaporozhets2014-10-201-1/+1
| * Ask the wiki repo, not Gollum, if it's emptyJacob Vosmaer2014-10-201-1/+1
|/
* Merge branch 'master' into '7-4-stable'Dmitriy Zaporozhets2014-10-173-34/+117
|\
| * Merge branch 'fix-oauth-block' into 'master'Dmitriy Zaporozhets2014-10-172-19/+89
| |\
| | * Fix account existing blockingDmitriy Zaporozhets2014-10-172-19/+89
| |/
| * Refactor error message a bitDmitriy Zaporozhets2014-10-171-2/+10
| * Merge branch 'issue-respect-single-sign-on' into 'master'Dmitriy Zaporozhets2014-10-173-23/+28
| |\
| | * Add regressiontest to verify allow_single_sign_on settingJan-Willem van der Meer2014-10-163-22/+27
| | * Remove LDAP save testJan-Willem van der Meer2014-10-161-8/+8
* | | documents updatedValery Sizov2014-10-174-19/+159
|/ /
* | Fix snippets seedsDmitriy Zaporozhets2014-10-161-8/+26
* | Merge branch 'add_some_stuff_to_changelog' into 'master'Dmitriy Zaporozhets2014-10-161-0/+7
|\ \
| * | Add items to changelogValery Sizov2014-10-161-0/+7
* | | Merge branch 'issue-respect-single-sign-on' into 'master'Dmitriy Zaporozhets2014-10-161-2/+6
|\ \ \ | |/ / |/| / | |/
| * Disallow new users from Oauth signup if `allow_single_sign_on` is disabledJan-Willem van der Meer2014-10-161-2/+6
|/