summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Add specs for authentication and configJan-Willem van der Meer2014-10-142-0/+73
| * | | Move dynamic omniauth declarations to initializerJan-Willem van der Meer2014-10-142-4/+5
| * | | DRY find method to find Gitlab userJan-Willem van der Meer2014-10-141-4/+2
| * | | Remove unused methodJan-Willem van der Meer2014-10-141-8/+0
| * | | Merge tests to support Multiple LDAP groupsJan-Willem van der Meer2014-10-135-24/+31
| * | | Refactor lib files for multiple LDAP groupsJan-Willem van der Meer2014-10-138-130/+262
| * | | Merge remote-tracking branch 'origin/master' into feature-multiple-ldap-serversJan-Willem van der Meer2014-10-1312-153/+245
| |\ \ \
| * | | | Apply configuration changes for Multiple LDAP serversJan-Willem van der Meer2014-10-133-16/+36
| * | | | Add config changes for mutliple LDAP support (EE only)Jan-Willem van der Meer2014-10-131-38/+75
| * | | | Add refactoring for multiple LDAP server supportJan-Willem van der Meer2014-10-136-33/+36
| * | | | Merge pull request #8020 from mr-vinn/note-trunc-linkDmitriy Zaporozhets2014-10-133-9/+110
| |\ \ \ \
* | \ \ \ \ Merge branch 'libravatar_documentation' into 'master'Dmitriy Zaporozhets2014-10-143-0/+71
|\ \ \ \ \ \
| * | | | | | Add a link to libravatar doc in gitlab.yml.example.Marin Jankovski2014-10-141-0/+1
| * | | | | | Add libravatar documentation.Marin Jankovski2014-10-142-0/+70
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'notification_level_note' into 'master'Dmitriy Zaporozhets2014-10-141-4/+8
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Different wording for notification note.Marin Jankovski2014-10-141-3/+3
| * | | | | Add a note about notification for a project.Marin Jankovski2014-10-141-4/+8
| |/ / / /
* | | | | Another link to GitHub flow.Sytse Sijbrandij2014-10-141-1/+1
|/ / / /
* | | | Merge pull request #8027 from bbodenmiller/patch-7Robert Schilling2014-10-131-0/+1
|\ \ \ \
| * | | | update changelogBen Bodenmiller2014-10-131-0/+1
|/ / / /
* | | | Merge pull request #7942 from cirosantilli/commit-changes-uppercaseDmitriy Zaporozhets2014-10-135-22/+21
|\ \ \ \ | |_|_|/ |/| | |
| * | | Make new and edit file submit more uniformCiro Santilli2014-10-085-22/+21
* | | | Merge branch 'sorting-users-in-admin' into 'master'Dmitriy Zaporozhets2014-10-135-11/+70
|\ \ \ \
| * | | | Admin: user sortingValery Sizov2014-10-135-11/+70
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-10-131-3/+3
|\ \ \ \ \
| * \ \ \ \ Merge pull request #8023 from bbodenmiller/patch-4Sytse Sijbrandij2014-10-131-3/+3
| |\ \ \ \ \
| | * | | | | minor updates to mysql cleanupBen Bodenmiller2014-10-131-3/+3
| | | |_|/ / | | |/| | |
* | | | | | Merge branch 'feature-oauth-refactoring' into 'master'Dmitriy Zaporozhets2014-10-137-159/+187
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Refactor OAuth refactorings to CEJan-Willem van der Meer2014-10-107-159/+187
| | |/ / / | |/| | |
* | | | | Merge pull request #8020 from mr-vinn/note-trunc-linkDmitriy Zaporozhets2014-10-133-9/+110
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| |
| * | | Improve dashboard note view and add testsVinnie Okada2014-10-123-11/+78
| * | | Preserve link href in truncated note viewVinnie Okada2014-10-122-7/+41
* | | | Merge pull request #8021 from bbodenmiller/schema.rbRobert Schilling2014-10-132-4/+2
|\ \ \ \
| * | | | simplify schema.rb reset in upgrade guidesBen Bodenmiller2014-10-122-4/+2
* | | | | Merge pull request #7742 from bbodenmiller/patch-7Sytse Sijbrandij2014-10-131-0/+68
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Cleanup MySQL databaseBen Bodenmiller2014-10-121-0/+68
* | | | | Merge branch 'ambiguous-sha' into 'master'fondevDmitriy Zaporozhets2014-10-1221-27/+48
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix testsDmitriy Zaporozhets2014-10-121-1/+1
| * | | | Fix spinach testsDmitriy Zaporozhets2014-10-101-1/+1
| * | | | Dontr decoarate already decorated stuffDmitriy Zaporozhets2014-10-101-1/+7
| * | | | Fix testsDmitriy Zaporozhets2014-10-101-2/+2
| * | | | Use 8chars short sha for commit in viewsDmitriy Zaporozhets2014-10-105-5/+11
| * | | | Dont raise exception when wrong commit id passedDmitriy Zaporozhets2014-10-101-0/+2
| * | | | Use full commit sha width for reference in note body to prevent Ambiguous SHA...Dmitriy Zaporozhets2014-10-101-1/+1
| * | | | Use short_id instead of [0..N] for short version of commit shaDmitriy Zaporozhets2014-10-1015-21/+28
| | |/ / | |/| |
* | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2014-10-122-0/+30
|\ \ \ \
| * \ \ \ Merge branch 'bug_with_apostrophe' into 'master'Dmitriy Zaporozhets2014-10-122-0/+30
| |\ \ \ \
| | * | | | Add a comment why this is done.Marin Jankovski2014-10-101-0/+6
| | * | | | Substitute right single quote back with apostrophe.Marin Jankovski2014-10-102-2/+3
| | * | | | Add a test for apostrophe in code blocks.Marin Jankovski2014-10-091-0/+8