summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 6.9.0 RC1v6.9.0.rc1Marin Jankovski2014-05-191-1/+1
|
* Update installation guide, create update guide.Marin Jankovski2014-05-192-8/+104
|
* Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-05-191-0/+1
|\
| * Merge pull request #6990 from Scooletz/masterDmitriy Zaporozhets2014-05-181-0/+1
| |\ | | | | | | .NET client introduced to docs
| | * .NET client introduced to docsScooletz2014-05-171-0/+1
| |/
* | Merge branch 'logrotate_update_fix' into 'master'Dmitriy Zaporozhets2014-05-192-3/+4
|\ \ | | | | | | | | | Clean up *.log.1 files during 6.6-to-6.7 upgrade
| * | Clean up *.log.1 files during 6.6-to-6.7 upgradeJacob Vosmaer2014-05-161-0/+4
| | |
| * | Remove logrotate step (no change in 6.8)Jacob Vosmaer2014-05-161-3/+0
| | |
* | | Merge branch 'use_example_email' into 'master'Dmitriy Zaporozhets2014-05-184-11/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | Use example email in documents and example files Fixes #1177
| * | | Update the examples to example.comMarin Jankovski2014-05-164-11/+11
| |/ /
* | | Merge branch 'add-link-to-ee-jenkins' into 'master'Dmitriy Zaporozhets2014-05-182-0/+4
|\ \ \ | |_|/ |/| | | | | | | | | | | Add link to ee jenkins /cc @marin
| * | Inform about the EE features.dosire2014-05-172-0/+4
|/ /
* | Merge branch 'fix-group-members-search' into 'master'Dmitriy Zaporozhets2014-05-163-1/+15
|\ \ | | | | | | | | | | | | | | | | | | Fix group members search Postgres only. 500 error when try to search group members on `/groups/:group_id/members` page
| * | Fix 500 error on group members searchDmitriy Zaporozhets2014-05-163-1/+15
| |/ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'improve-issue-box' into 'master'Dmitriy Zaporozhets2014-05-162-15/+40
|\ \ | |/ |/| | | Improve issue box colors
| * Improve issue box colors. Move colors to variables for future reuseDmitriy Zaporozhets2014-05-162-15/+40
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'ad_disabled_changelog'Dmitriy Zaporozhets2014-05-151-0/+1
|\ | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG
| * Add CHANGELOG entry for the AD disabled flagJacob Vosmaer2014-05-151-0/+1
| |
* | Merge branch 'api_ldap' into 'master'Dmitriy Zaporozhets2014-05-155-12/+36
|\ \ | | | | | | | | | Check user access during API calls
| * | Add API access checks to CHANGELOGJacob Vosmaer2014-05-151-0/+1
| | |
| * | Make user access test pass for the right reasonJacob Vosmaer2014-05-151-0/+1
| | | | | | | | | | | | | | | If we do not set a private token during the test, current_user will be nil because the user is not found, not due to the access check.
| * | Check user access status in API for current_userJacob Vosmaer2014-05-152-0/+10
| | |
| * | Move user access check to Gitlab::UserAccessJacob Vosmaer2014-05-152-12/+19
| | |
| * | Add test for current behavior of current_userJacob Vosmaer2014-05-151-0/+5
| |/
* | Merge branch 'mobile-ui-improvements' into 'master'Dmitriy Zaporozhets2014-05-153-5/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | Mobile ui improvements * Fixes blob view - https://twitter.com/jamesgecko/status/466675058664951808 * Hide project sidebar for xs * Hide group activity for xs
| * | Hide group dashboard and project sidebar for xs sizeDmitriy Zaporozhets2014-05-152-2/+2
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Hide control elements and last login for xs displayDmitriy Zaporozhets2014-05-151-3/+3
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-05-151-2/+2
|\ \ \ | |_|/ |/| |
| * | Merge pull request #6972 from Dugucloud/masterSytse Sijbrandij2014-05-141-2/+2
| |\ \ | | | | | | | | Correct a wrong spelling
| | * | Correct a wrong spelling秋纫2014-05-141-2/+2
| | |/ | | | | | | "abolute" -> "absolute"
* | | Merge branch 'ad_disabled_users' into 'master'Dmitriy Zaporozhets2014-05-156-4/+101
|\ \ \ | |/ / |/| | | | | | | | | | | Block 'disabled' AD users over SSH The existing SSH access check for LDAP users ignored the ActiveDirectory 'disabled' flag.
| * | Improve ad_disabled method nameJacob Vosmaer2014-05-143-4/+4
| | |
| * | Document the Active Directory magic numbersJacob Vosmaer2014-05-141-0/+3
| | |
| * | Use LDAP::Access.open to reuse the LDAP connectionJacob Vosmaer2014-05-141-2/+2
| | |
| * | Fix syntax error in AD disabled user filterJacob Vosmaer2014-05-141-1/+1
| | |
| * | Check for the AD disabled flag in Access#allowed?Jacob Vosmaer2014-05-141-1/+5
| | |
| * | Add LDAP::Person#ad_disabled?Jacob Vosmaer2014-05-141-0/+7
| | | | | | | | | | | | | | | Check the bit for disabled Active Directory users. The filter is based on http://ctogonewild.com/2009/09/03/bitmask-searches-in-ldap/ .
| * | Add spec for LDAP::Access#allowed?Jacob Vosmaer2014-05-141-0/+32
| | |
| * | Backport Adapter#dn_matches_filter? from EEJacob Vosmaer2014-05-142-0/+35
| | |
| * | Backport Adapter#ldap_search from EEJacob Vosmaer2014-05-141-1/+17
| |/
* | Merge branch 'update_grit_version' into 'master'Marin Jankovski2014-05-141-1/+1
|\ \ | | | | | | | | | Update grit version
| * | Bump grit version.Marin Jankovski2014-05-141-1/+1
| | |
* | | Merge branch 'pullreview' into 'master'Sytse Sijbrandij2014-05-141-0/+2
|\ \ \ | |/ / |/| | | | | Pullreview
| * | Add pullreview badge.dosire2014-05-141-0/+2
|/ /
* | Merge branch 'endpoint_example' into 'master'Sytse Sijbrandij2014-05-141-0/+31
|\ \ | |/ |/| | | Add an example webhook receiver
| * Add an example webhook receiverJacob Vosmaer2014-05-141-0/+31
|/
* Merge pull request #6970 from skv-headless/fix_ctrl_enter_notes_sendDmitriy Zaporozhets2014-05-141-1/+1
|\ | | | | fix ctrl+enter note send
| * fix ctrl+enter note sendEvgeniy Sokovikov2014-05-141-1/+1
| | | | | | use argument e instead of event
* | Merge branch 'gzip_assets_warning' into 'master'Sytse Sijbrandij2014-05-144-19/+12
|\ \ | |/ |/| | | Gzip assets warning for relative urls
| * Update warnings about relative url support.Marin Jankovski2014-05-134-20/+12
| |
View Lorry Controller Status