summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge branch 'improve-issue-box' into 'master'Dmitriy Zaporozhets2014-05-162-15/+40
|\ \ \ | |/ / |/| |
| * | Improve issue box colors. Move colors to variables for future reuseDmitriy Zaporozhets2014-05-162-15/+40
|/ /
* | Merge branch 'ad_disabled_changelog'Dmitriy Zaporozhets2014-05-151-0/+1
|\ \
| * | 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
|\ \ \
| * | | 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
| * | | 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
|\ \ \
| * | | Hide group dashboard and project sidebar for xs sizeDmitriy Zaporozhets2014-05-152-2/+2
| * | | Hide control elements and last login for xs displayDmitriy Zaporozhets2014-05-151-3/+3
* | | | 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秋纫2014-05-141-2/+2
| | |/ /
* | | | Merge branch 'ad_disabled_users' into 'master'Dmitriy Zaporozhets2014-05-156-4/+101
|\ \ \ \ | |/ / / |/| | |
| * | | 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
| * | | 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
|\ \ \
| * | | Bump grit version.Marin Jankovski2014-05-141-1/+1
* | | | Merge branch 'pullreview' into 'master'Sytse Sijbrandij2014-05-141-0/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Add pullreview badge.dosire2014-05-141-0/+2
|/ / /
* | | Merge branch 'endpoint_example' into 'master'Sytse Sijbrandij2014-05-141-0/+31
|\ \ \ | |/ / |/| |
| * | 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 sendEvgeniy Sokovikov2014-05-141-1/+1
* | | Merge branch 'gzip_assets_warning' into 'master'Sytse Sijbrandij2014-05-144-19/+12
|\ \ \ | |/ / |/| |
| * | Update warnings about relative url support.Marin Jankovski2014-05-134-20/+12
| * | Add warning to gitlab.yml related to gzip assets and relative links.Marin Jankovski2014-05-131-0/+1
* | | Remove text-shadow from headerDmitriy Zaporozhets2014-05-133-6/+0
* | | Merge branch 'green-theme' into 'master'Dmitriy Zaporozhets2014-05-132-8/+13
|\ \ \ | |/ / |/| |
| * | Green theme instead of darkDmitriy Zaporozhets2014-05-132-8/+13
* | | Merge branch 'improve-jira-linking' into 'master'Marin Jankovski2014-05-134-6/+70
|\ \ \ | |/ / |/| |
| * | Better name for config variable.Marin Jankovski2014-05-131-2/+2
| * | Add support for Jira ticket mentions in format JIRA-123.Marin Jankovski2014-05-134-6/+70
* | | Change diff header bgDmitriy Zaporozhets2014-05-131-9/+3
* | | Improve file titleDmitriy Zaporozhets2014-05-131-7/+7
* | | Merge branch 'improve-violet-theme' into 'master'Dmitriy Zaporozhets2014-05-132-9/+9
|\ \ \ | |/ / |/| |
| * | Improve violet themeDmitriy Zaporozhets2014-05-132-9/+9
|/ /
* | Merge pull request #6778 from dblessing/feature/mr_labelsDmitriy Zaporozhets2014-05-1315-17/+142
|\ \
| * | Implement Merge Request LabelsDrew Blessing2014-05-1315-17/+142
* | | Merge branch 'api-mr-merge' into 'master'Dmitriy Zaporozhets2014-05-134-5/+119
|\ \ \