summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fix_internal_snippets' into '7-4-stable'v7.4.2Jacob Vosmaer2014-10-244-1/+15
|\ | | | | | | | | | | Fix internal snippets See merge request !1216
| * 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
| | | | | Conflicts: CHANGELOG
* 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
| | | | | | | | 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 Zaporozhets2014-10-222-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 syntaxDmitriy Zaporozhets2014-10-221-2/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Fix rake gitlab:ldap:checkDmitriy Zaporozhets2014-10-222-31/+15
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | 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
|\ \ | | | | | | | | | | | | | | | Error messages fix See merge request !1201
| * | 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
|\ \ | | | | | | [7.4 rc fix] [doc] clarify when database.yml needs to be updated
| * | clarify when database.yml needs to be updatedBen Bodenmiller2014-10-181-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-18Valeriy Sizov2014-10-211-0/+6
|\ \ \ | | | | | | | | [7.4 rc fix] [doc] stop gitlab before mysql optimizations, run checks
| * | | stop gitlab before mysql optimizations, run checksBen Bodenmiller2014-10-181-0/+6
| |/ / | | | | | | Update MySQL optimizations to reflect doing updates after GitLab has already been started back up.
* | | Merge pull request #8067 from bbodenmiller/patch-19Valeriy Sizov2014-10-211-2/+2
|\ \ \ | | | | | | | | [7.4 rc fix] [doc] actually give command necessary to update unicorn
| * | | actually give command necessary to update unicornBen Bodenmiller2014-10-181-2/+2
| |/ / | | | | | | Give command to update unicorn.rb rather than just say you need to do it.
* | | Merge pull request #8070 from bbodenmiller/patch-22Valeriy Sizov2014-10-212-14/+10
|\ \ \ | | | | | | | | [7.4 rc fix] [doc] stop gitlab before backup
| * | | stop gitlab before backupBen Bodenmiller2014-10-181-5/+5
| | | |
| * | | stop gitlab before backupBen Bodenmiller2014-10-181-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-7Valeriy Sizov2014-10-211-0/+2
|\ \ \ | | | | | | | | [7.4 rc fix] [doc] add missing configure Redis to use sockets
| * | | add missing configure Redis to use socketsBen Bodenmiller2014-10-181-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-12Valeriy Sizov2014-10-211-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 guideBen Bodenmiller2014-10-181-0/+70
| |/ | | | | Add mysql optimizations from 7.3-to-7.4.md.
* | Merge branch 'fixes-from-master' into '7-4-stable'Valery Sizov2014-10-207-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 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
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Fix group user removal from admin areaDmitriy Zaporozhets2014-10-201-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Ask the wiki repo, not Gollum, if it's emptyJacob Vosmaer2014-10-201-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 Zaporozhets2014-10-173-34/+117
|\ | | | | | | | | | | Merge master into 7-4-stable See merge request !1189
| * Merge branch 'fix-oauth-block' into 'master'Dmitriy Zaporozhets2014-10-172-19/+89
| |\ | | | | | | | | | | | | | | | Fix user being blocked after oauth sign-in See merge request !1190
| | * Fix account existing blockingDmitriy Zaporozhets2014-10-172-19/+89
| |/ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Refactor error message a bitDmitriy Zaporozhets2014-10-171-2/+10
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Merge branch 'issue-respect-single-sign-on' into 'master'Dmitriy Zaporozhets2014-10-173-23/+28
| |\ | | | | | | | | | | | | | | | | | | | | | Issue respect single sign on Adds regression test for #1677 See merge request !1188
| | * Add regressiontest to verify allow_single_sign_on settingJan-Willem van der Meer2014-10-163-22/+27
| | | | | | | | | | | | | | | | | | | | | verification for #1677 Since testing omniauth_callback_controller.rb is very difficult, the logic is moved to the models
| | * Remove LDAP save testJan-Willem van der Meer2014-10-161-8/+8
| | | | | | | | | | | | This is handled within the LDAP class
* | | documents updatedValery Sizov2014-10-174-19/+159
|/ /
* | Fix snippets seedsDmitriy Zaporozhets2014-10-161-8/+26
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'add_some_stuff_to_changelog' into 'master'Dmitriy Zaporozhets2014-10-161-0/+7
|\ \ | | | | | | | | | | | | | | | Add a few items to changelog See merge request !1187
| * | Add items to changelogValery Sizov2014-10-161-0/+7
| | |
* | | Merge branch 'issue-respect-single-sign-on' into 'master'Dmitriy Zaporozhets2014-10-161-2/+6
|\ \ \ | |/ / |/| / | |/ | | | | | | | | Issue respect single sign on Fixes #1677 by making sure the per-build user is saved as well. Otherwise the user is passed to devise, and the user is saved afterwards, creating a successful signup. See merge request !1186
| * Disallow new users from Oauth signup if `allow_single_sign_on` is disabledJan-Willem van der Meer2014-10-161-2/+6
|/ | | | | | | Because devise will trigger a save, allowing unsaved users to login, behaviour had changed. The current implementation returns a pre-build user, which can be saved without errors. Reported in #1677
View Lorry Controller Status