Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix test assertions | Vinnie Okada | 2014-10-21 | 4 | -15/+15 |
* | Fix more Markdown preview tests | Vinnie Okada | 2014-10-18 | 2 | -4/+5 |
* | Fix houndci warnings | Vinnie Okada | 2014-10-18 | 4 | -10/+10 |
* | Fix long line in view | Vinnie Okada | 2014-10-18 | 1 | -1/+2 |
* | Add new Markdown preview test | Vinnie Okada | 2014-10-18 | 1 | -0/+7 |
* | Fix Markdown preview tests | Vinnie Okada | 2014-10-18 | 7 | -36/+45 |
* | Refactor Markdown preview tests | Vinnie Okada | 2014-10-18 | 7 | -39/+57 |
* | Use GET instead of POST for Markdown previews | Vinnie Okada | 2014-10-16 | 3 | -4/+4 |
* | Add Markdown preview to more forms | Vinnie Okada | 2014-10-15 | 21 | -141/+260 |
* | Merge branch 'note-omnibus-in-installation' into 'master' | Dmitriy Zaporozhets | 2014-10-15 | 2 | -1/+5 |
|\ | |||||
| * | Refer to the Omnibus installation from eveerywhere since people link to insta... | Sytse Sijbrandij | 2014-10-15 | 2 | -1/+5 |
* | | Merge branch 'improve-lock-mr-ui' into 'master' | Dmitriy Zaporozhets | 2014-10-15 | 2 | -1/+7 |
|\ \ | |/ |/| | |||||
| * | Show merge in progress message if MR is locked | Dmitriy Zaporozhets | 2014-10-15 | 2 | -1/+7 |
* | | Merge branch 'no_red_builds_policy' into 'master' | Dmitriy Zaporozhets | 2014-10-15 | 2 | -9/+12 |
|\ \ | |/ |/| | |||||
| * | Use clearer description. | Marin Jankovski | 2014-10-15 | 1 | -1/+1 |
| * | Describe who can trigger builds and where, add no red tests policy to contrib... | Marin Jankovski | 2014-10-15 | 2 | -9/+12 |
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2014-10-15 | 1 | -1/+1 |
|\ \ | |||||
| * \ | Merge pull request #8048 from skv-headless/master | Dmitriy Zaporozhets | 2014-10-15 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | same rendering for note diff as for usual diff | Evgeniy Sokovikov | 2014-10-15 | 1 | -1/+1 |
* | | | | Merge branch 'migrating_from_svn_doc' | Dmitriy Zaporozhets | 2014-10-15 | 4 | -2/+22 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Add links to the migration doc, make it clear import is only for git repos. | Marin Jankovski | 2014-10-15 | 3 | -2/+5 |
| * | | | Git is a distributed vcs. | Marin Jankovski | 2014-10-15 | 1 | -1/+1 |
| * | | | Clearer what to contribute. | Marin Jankovski | 2014-10-15 | 1 | -1/+1 |
| * | | | Add a doc on how to migrate from SVN to gitlab. | Marin Jankovski | 2014-10-15 | 1 | -0/+17 |
| | |/ | |/| | |||||
* | | | Merge branch 'valery_changelog' into 'master' | Dmitriy Zaporozhets | 2014-10-15 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | Add more stuff to changelog | Valery Sizov | 2014-10-14 | 1 | -0/+1 |
* | | | | Merge branch 'notifications_documentation' into 'master' | Dmitriy Zaporozhets | 2014-10-15 | 3 | -0/+72 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Fix spelling mistakes in notifications document. | Marin Jankovski | 2014-10-14 | 1 | -5/+5 |
| * | | | Add notifications documentation. | Marin Jankovski | 2014-10-14 | 3 | -0/+72 |
* | | | | Merge branch 'fix-star-icon' into 'master' | Dmitriy Zaporozhets | 2014-10-15 | 2 | -1/+2 |
|\ \ \ \ | |||||
| * | | | | Use stars icon on explore->starred page | Dmitriy Zaporozhets | 2014-10-14 | 2 | -1/+2 |
* | | | | | Merge branch 'improve-mr-widgets' into 'master' | Dmitriy Zaporozhets | 2014-10-15 | 2 | -11/+12 |
|\ \ \ \ \ | |||||
| * | | | | | Move "modify merge message link" to the right to prevent accidently hiting ac... | Dmitriy Zaporozhets | 2014-10-14 | 1 | -9/+8 |
| * | | | | | Make accept MR widget looks similar to panels | Dmitriy Zaporozhets | 2014-10-14 | 1 | -2/+4 |
| |/ / / / | |||||
* | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2014-10-15 | 2 | -0/+15 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Merge pull request #7744 from bbodenmiller/patch-14 | Robert Schilling | 2014-10-15 | 1 | -0/+6 |
| |\ \ \ \ | |||||
| | * | | | | add missing cleanup step | Ben Bodenmiller | 2014-10-14 | 1 | -0/+6 |
| * | | | | | Merge pull request #8041 from bbodenmiller/patch-4 | Sytse Sijbrandij | 2014-10-15 | 1 | -0/+9 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | make sure tables are UTF8 capable | Ben Bodenmiller | 2014-10-14 | 1 | -0/+9 |
| |/ / / / | |||||
* | | | | | Merge branch 'issue-ldap-initialization' into 'master' | Dmitriy Zaporozhets | 2014-10-15 | 2 | -8/+10 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Only enable LDAP providers if LDAP is enabled | Jan-Willem van der Meer | 2014-10-15 | 2 | -8/+10 |
|/ / / / | |||||
* | | | | Merge branch 'feature-multiple-ldap-servers' into 'master' | Dmitriy Zaporozhets | 2014-10-14 | 26 | -236/+496 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Explain new configuration options. | Jan-Willem van der Meer | 2014-10-14 | 1 | -12/+10 |
| * | | | Add valid LDAP server for testing | Jan-Willem van der Meer | 2014-10-14 | 1 | -2/+1 |
| * | | | Use Hash syntax for LDAP server declaration | Jan-Willem van der Meer | 2014-10-14 | 7 | -29/+29 |
| * | | | Remove unused methods | Jan-Willem van der Meer | 2014-10-14 | 2 | -12/+0 |
| * | | | Add explaining note to authentication method [skip ci] | Jan-Willem van der Meer | 2014-10-14 | 1 | -0/+2 |
| * | | | Use server specific uid | Jan-Willem van der Meer | 2014-10-14 | 1 | -1/+1 |
| * | | | Make sure the filters are applied | Jan-Willem van der Meer | 2014-10-14 | 1 | -8/+9 |
| * | | | Fix authorization for LDAP login | Jan-Willem van der Meer | 2014-10-14 | 2 | -1/+5 |