Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add addressable explicitly to Gemfilev7.4.3 | Dmitriy Zaporozhets | 2014-10-30 | 2 | -0/+2 |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | update changelog | Valery Sizov | 2014-10-29 | 1 | -0/+1 |
| | |||||
* | Explicitly require addressable gem feature you need. Fixes Buildbox CI ↵ | Dmitriy Zaporozhets | 2014-10-29 | 1 | -0/+2 |
| | | | | | | integration Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Fix raw view for public snippets | Valery Sizov | 2014-10-29 | 3 | -1/+14 |
| | |||||
* | Dont allow guests..developers to manage group members | Dmitriy Zaporozhets | 2014-10-29 | 2 | -5/+17 |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Split group members api | Dmitriy Zaporozhets | 2014-10-29 | 5 | -175/+205 |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Add failing test that should be green after group members api get fixed | Dmitriy Zaporozhets | 2014-10-29 | 1 | -3/+17 |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | update changelog && bump version | Valery Sizov | 2014-10-29 | 2 | -1/+5 |
| | |||||
* | Merge branch 'fix_internal_snippets' into '7-4-stable'v7.4.2 | Jacob Vosmaer | 2014-10-24 | 4 | -1/+15 |
|\ | | | | | | | | | | | Fix internal snippets See merge request !1216 | ||||
| * | 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 |
| | | | | | Conflicts: CHANGELOG | ||||
* | 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 |
| | | | | | | | | Fix 500 error on login page if ldap enabled and sign-in disabled Related to gitlab/gitlabhq#1701 See merge request !1209 | ||||
* | Merge branch 'stable-fix-ldap-check' into '7-4-stable' | Dmitriy Zaporozhets | 2014-10-22 | 2 | -31/+15 |
|\ | | | | | | | | | | | | | | | Fix ldap check [stable] Fix ldap check for stable branch See merge request !1208 | ||||
| * | Make gitlab ldap check work for old and new syntax | Dmitriy Zaporozhets | 2014-10-22 | 1 | -2/+2 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Fix rake gitlab:ldap:check | Dmitriy Zaporozhets | 2014-10-22 | 2 | -31/+15 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | 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 |
|\ \ | | | | | | | | | | | | | | | | Error messages fix See merge request !1201 | ||||
| * | | 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 |
|\ \ | | | | | | | [7.4 rc fix] [doc] clarify when database.yml needs to be updated | ||||
| * | | clarify when database.yml needs to be updated | Ben Bodenmiller | 2014-10-18 | 1 | -1/+1 |
| | | | | | | | | | Clarify that database.yml should be updated if you are running a MySQL Database. Remove wording that de-emphasises importance of update. | ||||
* | | | Merge pull request #8066 from bbodenmiller/patch-18 | Valeriy Sizov | 2014-10-21 | 1 | -0/+6 |
|\ \ \ | | | | | | | | | [7.4 rc fix] [doc] stop gitlab before mysql optimizations, run checks | ||||
| * | | | stop gitlab before mysql optimizations, run checks | Ben Bodenmiller | 2014-10-18 | 1 | -0/+6 |
| |/ / | | | | | | | Update MySQL optimizations to reflect doing updates after GitLab has already been started back up. | ||||
* | | | Merge pull request #8067 from bbodenmiller/patch-19 | Valeriy Sizov | 2014-10-21 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | [7.4 rc fix] [doc] actually give command necessary to update unicorn | ||||
| * | | | actually give command necessary to update unicorn | Ben Bodenmiller | 2014-10-18 | 1 | -2/+2 |
| |/ / | | | | | | | Give command to update unicorn.rb rather than just say you need to do it. | ||||
* | | | Merge pull request #8070 from bbodenmiller/patch-22 | Valeriy Sizov | 2014-10-21 | 2 | -14/+10 |
|\ \ \ | | | | | | | | | [7.4 rc fix] [doc] stop gitlab before backup | ||||
| * | | | stop gitlab before backup | Ben Bodenmiller | 2014-10-18 | 1 | -5/+5 |
| | | | | |||||
| * | | | stop gitlab before backup | Ben Bodenmiller | 2014-10-18 | 1 | -9/+5 |
| |/ / | | | | | | | Stopping gitlab before backup ensures that backup has everything before upgrade incase something goes wrong. Also remove extra cd. | ||||
* | | | Merge pull request #8071 from bbodenmiller/patch-7 | Valeriy Sizov | 2014-10-21 | 1 | -0/+2 |
|\ \ \ | | | | | | | | | [7.4 rc fix] [doc] add missing configure Redis to use sockets | ||||
| * | | | add missing configure Redis to use sockets | Ben Bodenmiller | 2014-10-18 | 1 | -0/+2 |
| |/ / | | | | | | | Add details from 7.2-to-7.3.md. Replaces https://github.com/gitlabhq/gitlabhq/pull/8047. | ||||
* | | | Merge pull request #8072 from bbodenmiller/patch-12 | Valeriy Sizov | 2014-10-21 | 1 | -0/+70 |
|\ \ \ | |_|/ |/| | | [7.4 rc fix] [doc] add optimizations for mysql to 6.x->7.4 guide | ||||
| * | | add optimizations for mysql to 6.x->7.4 guide | Ben Bodenmiller | 2014-10-18 | 1 | -0/+70 |
| |/ | | | | | Add mysql optimizations from 7.3-to-7.4.md. | ||||
* | | Merge branch 'fixes-from-master' into '7-4-stable' | Valery Sizov | 2014-10-20 | 7 | -7/+35 |
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | Fixes from master It includes: * https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1193 * https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1196 * https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1195 See merge request !1198 | ||||
| * | 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 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Fix group user removal from admin area | Dmitriy Zaporozhets | 2014-10-20 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Ask the wiki repo, not Gollum, if it's empty | Jacob Vosmaer | 2014-10-20 | 1 | -1/+1 |
|/ | | | | | | | We need to skip empty repositories when creating a backup. Before this change, we were asking gollum-lib if the wiki contains any _pages_. Now we ask gitlab_git if the repository contains _files_. This should resolve gollum_lib Grit timeouts in the backup script. | ||||
* | Merge branch 'master' into '7-4-stable' | Dmitriy Zaporozhets | 2014-10-17 | 3 | -34/+117 |
|\ | | | | | | | | | | | Merge master into 7-4-stable See merge request !1189 | ||||
| * | Merge branch 'fix-oauth-block' into 'master' | Dmitriy Zaporozhets | 2014-10-17 | 2 | -19/+89 |
| |\ | | | | | | | | | | | | | | | | Fix user being blocked after oauth sign-in See merge request !1190 | ||||
| | * | Fix account existing blocking | Dmitriy Zaporozhets | 2014-10-17 | 2 | -19/+89 |
| |/ | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Refactor error message a bit | Dmitriy Zaporozhets | 2014-10-17 | 1 | -2/+10 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Merge branch 'issue-respect-single-sign-on' into 'master' | Dmitriy Zaporozhets | 2014-10-17 | 3 | -23/+28 |
| |\ | | | | | | | | | | | | | | | | | | | | | | Issue respect single sign on Adds regression test for #1677 See merge request !1188 |