summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* documents updatedv7.4.0.rc1Valery Sizov2014-10-163-9/+149
* Fix snippets seedsDmitriy Zaporozhets2014-10-161-8/+26
* Merge branch 'add_some_stuff_to_changelog' into 'master'Dmitriy Zaporozhets2014-10-161-0/+7
|\
| * Add items to changelogValery Sizov2014-10-161-0/+7
* | Merge branch 'issue-respect-single-sign-on' into 'master'Dmitriy Zaporozhets2014-10-161-2/+6
|\ \ | |/ |/|
| * Disallow new users from Oauth signup if `allow_single_sign_on` is disabledJan-Willem van der Meer2014-10-161-2/+6
|/
* Merge branch 'fix_project_number_ci' into 'master'Dmitriy Zaporozhets2014-10-161-4/+4
|\
| * Make semaphore configuration an ordered list.Achilleas Pipinellis2014-10-151-3/+3
| * Point to correct project on githost.io.Achilleas Pipinellis2014-10-151-1/+1
|/
* Merge branch 'note-omnibus-in-installation' into 'master'Dmitriy Zaporozhets2014-10-152-1/+5
|\
| * Refer to the Omnibus installation from eveerywhere since people link to insta...Sytse Sijbrandij2014-10-152-1/+5
* | Merge branch 'improve-lock-mr-ui' into 'master'Dmitriy Zaporozhets2014-10-152-1/+7
|\ \ | |/ |/|
| * Show merge in progress message if MR is lockedDmitriy Zaporozhets2014-10-152-1/+7
* | Merge branch 'no_red_builds_policy' into 'master'Dmitriy Zaporozhets2014-10-152-9/+12
|\ \ | |/ |/|
| * Use clearer description.Marin Jankovski2014-10-151-1/+1
| * Describe who can trigger builds and where, add no red tests policy to contrib...Marin Jankovski2014-10-152-9/+12
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-10-151-1/+1
|\ \
| * \ Merge pull request #8048 from skv-headless/masterDmitriy Zaporozhets2014-10-151-1/+1
| |\ \
| | * | same rendering for note diff as for usual diffEvgeniy Sokovikov2014-10-151-1/+1
* | | | Merge branch 'migrating_from_svn_doc'Dmitriy Zaporozhets2014-10-154-2/+22
|\ \ \ \ | |/ / / |/| | |
| * | | Add links to the migration doc, make it clear import is only for git repos.Marin Jankovski2014-10-153-2/+5
| * | | Git is a distributed vcs.Marin Jankovski2014-10-151-1/+1
| * | | Clearer what to contribute.Marin Jankovski2014-10-151-1/+1
| * | | Add a doc on how to migrate from SVN to gitlab.Marin Jankovski2014-10-151-0/+17
| | |/ | |/|
* | | Merge branch 'valery_changelog' into 'master'Dmitriy Zaporozhets2014-10-151-0/+1
|\ \ \
| * | | Add more stuff to changelogValery Sizov2014-10-141-0/+1
* | | | Merge branch 'notifications_documentation' into 'master'Dmitriy Zaporozhets2014-10-153-0/+72
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix spelling mistakes in notifications document.Marin Jankovski2014-10-141-5/+5
| * | | Add notifications documentation.Marin Jankovski2014-10-143-0/+72
* | | | Merge branch 'fix-star-icon' into 'master'Dmitriy Zaporozhets2014-10-152-1/+2
|\ \ \ \
| * | | | Use stars icon on explore->starred pageDmitriy Zaporozhets2014-10-142-1/+2
* | | | | Merge branch 'improve-mr-widgets' into 'master'Dmitriy Zaporozhets2014-10-152-11/+12
|\ \ \ \ \
| * | | | | Move "modify merge message link" to the right to prevent accidently hiting ac...Dmitriy Zaporozhets2014-10-141-9/+8
| * | | | | Make accept MR widget looks similar to panelsDmitriy Zaporozhets2014-10-141-2/+4
| |/ / / /
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-10-152-0/+15
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge pull request #7744 from bbodenmiller/patch-14Robert Schilling2014-10-151-0/+6
| |\ \ \ \
| | * | | | add missing cleanup stepBen Bodenmiller2014-10-141-0/+6
| * | | | | Merge pull request #8041 from bbodenmiller/patch-4Sytse Sijbrandij2014-10-151-0/+9
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | make sure tables are UTF8 capableBen Bodenmiller2014-10-141-0/+9
| |/ / / /
* | | | | Merge branch 'issue-ldap-initialization' into 'master'Dmitriy Zaporozhets2014-10-152-8/+10
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Only enable LDAP providers if LDAP is enabledJan-Willem van der Meer2014-10-152-8/+10
|/ / / /
* | | | Merge branch 'feature-multiple-ldap-servers' into 'master'Dmitriy Zaporozhets2014-10-1426-236/+496
|\ \ \ \ | |/ / / |/| | |
| * | | Explain new configuration options.Jan-Willem van der Meer2014-10-141-12/+10
| * | | Add valid LDAP server for testingJan-Willem van der Meer2014-10-141-2/+1
| * | | Use Hash syntax for LDAP server declarationJan-Willem van der Meer2014-10-147-29/+29
| * | | Remove unused methodsJan-Willem van der Meer2014-10-142-12/+0
| * | | Add explaining note to authentication method [skip ci]Jan-Willem van der Meer2014-10-141-0/+2
| * | | Use server specific uidJan-Willem van der Meer2014-10-141-1/+1
| * | | Make sure the filters are appliedJan-Willem van der Meer2014-10-141-8/+9
| * | | Fix authorization for LDAP loginJan-Willem van der Meer2014-10-142-1/+5