summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Revise main README for cleanup and some minor clarificationsWolfram Twelker2015-02-081-19/+22
* Add gitlab to oauth providersDmitriy Zaporozhets2015-02-071-0/+3
* Merge branch 'refactor-avatars' into 'master'Dmitriy Zaporozhets2015-02-0710-13/+9
|\
| * Add project-avatar and group-avatar css classesDmitriy Zaporozhets2015-02-0710-13/+9
* | Merge branch 'clean-up-devise-views' into 'master'Dmitriy Zaporozhets2015-02-076-39/+27
|\ \
| * | Clean up devise views.Douwe Maan2015-02-056-39/+27
* | | Merge branch 'filter-private-token-param' into 'master'Dmitriy Zaporozhets2015-02-071-1/+1
|\ \ \ | |_|/ |/| |
| * | Filter private_token and password_confirmation params from logs.Douwe Maan2015-02-061-1/+1
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2015-02-062-0/+14
|\ \ \
| * \ \ Merge branch 'webhooks-and-internal-services' into 'master'Sytse Sijbrandij2015-02-072-0/+14
| |\ \ \
| | * | | Add doc on "Web Hooks and insecure internal web services".Douwe Maan2015-02-072-0/+14
| | |/ /
* | | | Fix tests for semaphoreDmitriy Zaporozhets2015-02-061-5/+2
|/ / /
* | | Merge branch 'mention-groups'Dmitriy Zaporozhets2015-02-066-11/+27
|\ \ \
| * | | Update changelog.Douwe Maan2015-02-051-1/+1
| * | | Allow groups to be mentioned.Douwe Maan2015-02-055-10/+25
* | | | Merge branch 'order-index' into 'master'Dmitriy Zaporozhets2015-02-065-10/+37
|\ \ \ \
| * | | | Fix spelling in changelogDmitriy Zaporozhets2015-02-061-2/+2
| * | | | Add index on order columnsDmitriy Zaporozhets2015-02-065-9/+36
|/ / / /
* | | | Merge branch 'api-default-order' into 'master'Dmitriy Zaporozhets2015-02-0656-216/+412
|\ \ \ \
| * | | | Improve testsDmitriy Zaporozhets2015-02-062-5/+5
| * | | | Fix testsDmitriy Zaporozhets2015-02-053-22/+27
| * | | | Refactor and improve sorting objects in API for projects, issues and merge re...Dmitriy Zaporozhets2015-02-058-63/+101
| * | | | Apply default scope to labels and remove one for notesDmitriy Zaporozhets2015-02-057-9/+7
| * | | | Refactor issuable sorting a bitDmitriy Zaporozhets2015-02-055-11/+19
| * | | | Refactor sorting in projectDmitriy Zaporozhets2015-02-0518-108/+195
| * | | | Fix method overlap for issue sortingDmitriy Zaporozhets2015-02-055-3/+5
| * | | | Explicitly define ordering in models using default_scopeDmitriy Zaporozhets2015-02-0522-16/+67
| * | | | Add timestamps to identityDmitriy Zaporozhets2015-02-052-6/+13
| | |_|/ | |/| |
* | | | Merge branch 'markdown-preview-via-post' into 'master'Dmitriy Zaporozhets2015-02-064-4/+5
|\ \ \ \
| * | | | Don't have Markdown preview fail for long content by using POST rather than GET.Douwe Maan2015-02-064-4/+5
| |/ / /
* | | | Merge branch 'update_smtp_example' into 'master'Dmitriy Zaporozhets2015-02-061-2/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add openssl_verify_mode option to the smtp configuration example.Marin Jankovski2015-02-051-2/+3
* | | | Merge branch 'refactor_import' into 'master'Valery Sizov2015-02-064-31/+45
|\ \ \ \ | |/ / / |/| | |
| * | | GitHub importer refactoringValery Sizov2015-02-054-31/+45
|/ / /
* | | Merge branch 'submit-comment-on-command-enter' into 'master'Dmitriy Zaporozhets2015-02-062-2/+2
|\ \ \
| * | | Submit comment on command-enter.Douwe Maan2015-02-052-2/+2
| |/ /
* | | Merge branch 'remove-group-milestone-participants-duplicates' into 'master'Dmitriy Zaporozhets2015-02-062-4/+4
|\ \ \
| * | | Remove duplicates from group milestone participants list.Douwe Maan2015-02-052-4/+4
| |/ /
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqValery Sizov2015-02-051-2/+5
|\ \ \
| * \ \ Merge pull request #8318 from bbodenmiller/patch-9Jeroen van Baarsen2015-02-051-2/+5
| |\ \ \ | | |/ / | |/| |
| | * | add editor command to update database.yml; cleanupBen Bodenmiller2014-11-231-2/+5
* | | | Merge branch 'gitlab_importer' into 'master'Dmitriy Zaporozhets2015-02-0632-125/+615
|\ \ \ \ | |/ / / |/| | |
| * | | gitlab.com importer: refactorigValery Sizov2015-02-0514-140/+85
| * | | gitlab.com importer: fix specs after refactoringValery Sizov2015-02-051-2/+2
| * | | code foldingValery Sizov2015-02-051-1/+1
| * | | update changelogValery Sizov2015-02-051-0/+2
| * | | Gitlab.com integration: code foldingValery Sizov2015-02-052-3/+3
| * | | GitLab.com integration: refactoringValery Sizov2015-02-0516-32/+52
| * | | GitLab.com integration: small view fixValery Sizov2015-02-052-2/+2
| * | | GitLab.com integration: refactoringValery Sizov2015-02-055-6/+6