summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8620 from namnatulco/masterJeroen van Baarsen2015-02-091-0/+2
|\
| * Added a note saying inline HTML is disabled by defaultRens van der Heijden2015-01-211-0/+2
* | Merge pull request #8580 from j0k3r/asanaDmitriy Zaporozhets2015-02-0810-4/+217
|\ \
| * | Fix testJeremy2015-02-021-1/+0
| * | Fix HoundCIJeremy2015-02-022-9/+19
| * | Add restrict_to_branch to service controllerJeremy2015-02-023-2/+6
| * | Add Asana serviceJeremy2015-02-029-3/+203
* | | Merge pull request #8740 from cinderblock/masterDmitriy Zaporozhets2015-02-081-3/+3
|\ \ \
| * | | Be less restrictive on key comment extractionCameron Tacklind2015-02-051-3/+3
* | | | Merge pull request #8749 from sashkab/b8748-emailheaderDmitriy Zaporozhets2015-02-082-0/+4
|\ \ \ \
| * | | | Addex X-GitLab-Project header to GitLab emails.Aleks Bunin2015-02-072-0/+4
* | | | | Merge branch 'duduribeiro-fix_showing_overflow' into 'master'Dmitriy Zaporozhets2015-02-082-63/+77
|\ \ \ \ \
| * \ \ \ \ Merge branch 'fix_showing_overflow' of https://github.com/duduribeiro/gitlabh...Dmitriy Zaporozhets2015-02-072-63/+77
| |\ \ \ \ \
| | * | | | | Fix showing overflow when have several items at sidebarCarlos Ribeiro2015-02-072-63/+77
* | | | | | | Merge branch 'autosave' into 'master'Dmitriy Zaporozhets2015-02-084-2/+50
|\ \ \ \ \ \ \
| * | | | | | | Autosave and autorestore unsaved comments.Douwe Maan2015-02-074-2/+50
* | | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2015-02-073-9/+17
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'import-all-projects' into 'master'Dmitriy Zaporozhets2015-02-083-9/+17
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Add "Import all projects" button to GitHub and GitLab import pages.Douwe Maan2015-02-073-9/+17
| | |/ / / / / /
* | | | | | | | Merge branch 'notification_email'Dmitriy Zaporozhets2015-02-0713-42/+123
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Allow notification email to be set separately from primary email.Douwe Maan2015-02-0713-42/+123
| |/ / / / / /
* | | | | | | 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
| |/ / / / / /
View Lorry Controller Status