summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Factor behaviors.scss constantsCiro Santilli2014-10-271-8/+18
* Merge branch 'improve_release_doc' into 'master'Dmitriy Zaporozhets2014-10-271-34/+41
|\
| * update release docValery Sizov2014-10-271-4/+21
| * Added relative dates, removed packages for GitLab.com.Sytse Sijbrandij2014-10-231-31/+15
| * Improved release documentationValery Sizov2014-10-211-1/+7
* | Merge branch 'fix_raw_view_snippets' into 'master'Dmitriy Zaporozhets2014-10-273-1/+14
|\ \
| * | Fix raw view for public snippetsValery Sizov2014-10-273-1/+14
* | | Merge branch '7-4-stable-non-conflict' into 'master'Valery Sizov2014-10-275-53/+116
|\ \ \
| * \ \ Merge branch 'master' into 7-4-stableValery Sizov2014-10-27100-365/+507
| |\ \ \ | | |/ /
| * | | 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' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-10-272-31/+22
|\ \ \ \ | |_|/ / |/| | |
| * | | 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 #8126 from bbodenmiller/cleanup-releaseSytse Sijbrandij2014-10-241-19/+19
| |\ \ \ \