Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Move user access check to Gitlab::UserAccess | Jacob Vosmaer | 2014-05-15 | 2 | -12/+19 | |
| * | | | Add test for current behavior of current_user | Jacob Vosmaer | 2014-05-15 | 1 | -0/+5 | |
| |/ / | ||||||
* | | | Merge branch 'mobile-ui-improvements' into 'master' | Dmitriy Zaporozhets | 2014-05-15 | 3 | -5/+5 | |
|\ \ \ | ||||||
| * | | | Hide group dashboard and project sidebar for xs size | Dmitriy Zaporozhets | 2014-05-15 | 2 | -2/+2 | |
| * | | | Hide control elements and last login for xs display | Dmitriy Zaporozhets | 2014-05-15 | 1 | -3/+3 | |
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2014-05-15 | 1 | -2/+2 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | Merge pull request #6972 from Dugucloud/master | Sytse Sijbrandij | 2014-05-14 | 1 | -2/+2 | |
| |\ \ \ | ||||||
| | * | | | Correct a wrong spelling | 秋纫 | 2014-05-14 | 1 | -2/+2 | |
| | |/ / | ||||||
* | | | | Merge branch 'ad_disabled_users' into 'master' | Dmitriy Zaporozhets | 2014-05-15 | 6 | -4/+101 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Improve ad_disabled method name | Jacob Vosmaer | 2014-05-14 | 3 | -4/+4 | |
| * | | | Document the Active Directory magic numbers | Jacob Vosmaer | 2014-05-14 | 1 | -0/+3 | |
| * | | | Use LDAP::Access.open to reuse the LDAP connection | Jacob Vosmaer | 2014-05-14 | 1 | -2/+2 | |
| * | | | Fix syntax error in AD disabled user filter | Jacob Vosmaer | 2014-05-14 | 1 | -1/+1 | |
| * | | | Check for the AD disabled flag in Access#allowed? | Jacob Vosmaer | 2014-05-14 | 1 | -1/+5 | |
| * | | | Add LDAP::Person#ad_disabled? | Jacob Vosmaer | 2014-05-14 | 1 | -0/+7 | |
| * | | | Add spec for LDAP::Access#allowed? | Jacob Vosmaer | 2014-05-14 | 1 | -0/+32 | |
| * | | | Backport Adapter#dn_matches_filter? from EE | Jacob Vosmaer | 2014-05-14 | 2 | -0/+35 | |
| * | | | Backport Adapter#ldap_search from EE | Jacob Vosmaer | 2014-05-14 | 1 | -1/+17 | |
| |/ / | ||||||
* | | | Merge branch 'update_grit_version' into 'master' | Marin Jankovski | 2014-05-14 | 1 | -1/+1 | |
|\ \ \ | ||||||
| * | | | Bump grit version. | Marin Jankovski | 2014-05-14 | 1 | -1/+1 | |
* | | | | Merge branch 'pullreview' into 'master' | Sytse Sijbrandij | 2014-05-14 | 1 | -0/+2 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Add pullreview badge. | dosire | 2014-05-14 | 1 | -0/+2 | |
|/ / / | ||||||
* | | | Merge branch 'endpoint_example' into 'master' | Sytse Sijbrandij | 2014-05-14 | 1 | -0/+31 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Add an example webhook receiver | Jacob Vosmaer | 2014-05-14 | 1 | -0/+31 | |
|/ / | ||||||
* | | Merge pull request #6970 from skv-headless/fix_ctrl_enter_notes_send | Dmitriy Zaporozhets | 2014-05-14 | 1 | -1/+1 | |
|\ \ | ||||||
| * | | fix ctrl+enter note send | Evgeniy Sokovikov | 2014-05-14 | 1 | -1/+1 | |
* | | | Merge branch 'gzip_assets_warning' into 'master' | Sytse Sijbrandij | 2014-05-14 | 4 | -19/+12 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Update warnings about relative url support. | Marin Jankovski | 2014-05-13 | 4 | -20/+12 | |
| * | | Add warning to gitlab.yml related to gzip assets and relative links. | Marin Jankovski | 2014-05-13 | 1 | -0/+1 | |
* | | | Remove text-shadow from header | Dmitriy Zaporozhets | 2014-05-13 | 3 | -6/+0 | |
* | | | Merge branch 'green-theme' into 'master' | Dmitriy Zaporozhets | 2014-05-13 | 2 | -8/+13 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Green theme instead of dark | Dmitriy Zaporozhets | 2014-05-13 | 2 | -8/+13 | |
* | | | Merge branch 'improve-jira-linking' into 'master' | Marin Jankovski | 2014-05-13 | 4 | -6/+70 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Better name for config variable. | Marin Jankovski | 2014-05-13 | 1 | -2/+2 | |
| * | | Add support for Jira ticket mentions in format JIRA-123. | Marin Jankovski | 2014-05-13 | 4 | -6/+70 | |
* | | | Change diff header bg | Dmitriy Zaporozhets | 2014-05-13 | 1 | -9/+3 | |
* | | | Improve file title | Dmitriy Zaporozhets | 2014-05-13 | 1 | -7/+7 | |
* | | | Merge branch 'improve-violet-theme' into 'master' | Dmitriy Zaporozhets | 2014-05-13 | 2 | -9/+9 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Improve violet theme | Dmitriy Zaporozhets | 2014-05-13 | 2 | -9/+9 | |
|/ / | ||||||
* | | Merge pull request #6778 from dblessing/feature/mr_labels | Dmitriy Zaporozhets | 2014-05-13 | 15 | -17/+142 | |
|\ \ | ||||||
| * | | Implement Merge Request Labels | Drew Blessing | 2014-05-13 | 15 | -17/+142 | |
* | | | Merge branch 'api-mr-merge' into 'master' | Dmitriy Zaporozhets | 2014-05-13 | 4 | -5/+119 | |
|\ \ \ | ||||||
| * | | | More tests for merge api | Dmitriy Zaporozhets | 2014-05-13 | 1 | -0/+15 | |
| * | | | Add some tests for merge API | Dmitriy Zaporozhets | 2014-05-13 | 3 | -6/+14 | |
| * | | | Docs for merge api | Dmitriy Zaporozhets | 2014-05-12 | 2 | -0/+49 | |
| * | | | Specify error codes for merge api | Dmitriy Zaporozhets | 2014-05-12 | 1 | -9/+12 | |
| * | | | Draft API method for merge MR | Dmitriy Zaporozhets | 2014-05-12 | 1 | -0/+39 | |
* | | | | Merge pull request #6109 from jamit/master | Dmitriy Zaporozhets | 2014-05-13 | 5 | -0/+46 | |
|\ \ \ \ | ||||||
| * | | | | Added some tests. | Philip Blatter | 2014-05-05 | 1 | -0/+20 | |
| * | | | | Now using correct ids as reference if we are informing about a new note. | Philip Blatter | 2014-05-05 | 1 | -2/+2 |