summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'commit-range-reference' into 'master'Dmitriy Zaporozhets2015-03-082-4/+40
|\
| * Automatically link commit ranges to compare page.Douwe Maan2015-03-072-4/+40
* | use constant-time string compare for internal api authenticationJörg Thalheim2015-03-061-1/+4
|/
* Added comment notification events to HipChat and Slack services.Stan Hu2015-03-062-0/+106
* Merge branch 'timeout' into 'master'Dmitriy Zaporozhets2015-03-051-0/+13
|\
| * Increase timeout for Git-over-HTTP requests.Douwe Maan2015-03-041-0/+13
* | Merge branch 'add-more-slack-notifications' into 'master'Dmitriy Zaporozhets2015-03-041-0/+1
|\ \
| * | Issue #595: Support Slack notifications upon issue and merge request eventsStan Hu2015-03-031-0/+1
| |/
* | Web Hook sends email of pusherValery Sizov2015-03-041-0/+2
* | Merge branch 'fix-namespace-merge-request-url' into 'master'Marin Jankovski2015-03-041-11/+7
|\ \
| * | Fix URL builder to use GitlabRoutingHelperStan Hu2015-03-031-11/+7
* | | Merge branch 'project-existence-leak' into 'master'Dmitriy Zaporozhets2015-03-032-41/+50
|\ \ \
| * | | Don't leak information about private project existence via Git-over-SSH/HTTP.Douwe Maan2015-03-022-41/+50
* | | | Merge branch 'go-import' into 'master'Marin Jankovski2015-03-032-20/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Revert "Merge branch 'go-get-workaround-nginx' of https://github.com/mattes/g...Douwe Maan2015-03-032-20/+0
| | |/ | |/|
* | | Merge branch 'fix-merge-request-url-builder' into 'master'Jeroen van Baarsen2015-03-031-0/+9
|\ \ \ | |/ / |/| |
| * | Fix merge request URL passed to Webhooks.Stan Hu2015-02-241-0/+9
* | | Merge branch 'strict-rubocop-rules' into 'master'Dmitriy Zaporozhets2015-03-031-1/+1
|\ \ \
| * | | Enable ParenthesesAsGroupedExpression ruleDmitriy Zaporozhets2015-03-021-1/+1
* | | | Add brakeman and jasmineDmitriy Zaporozhets2015-03-021-1/+1
* | | | Add brakeman rake task and improve code securityDmitriy Zaporozhets2015-03-021-1/+1
* | | | Add rake task for brakemanDmitriy Zaporozhets2015-03-021-0/+9
|/ / /
* | | Support names starting with a digit or _ for projects and usersNicolas Bouilleaud2015-03-021-1/+1
* | | Merge pull request #8890 from sue445/feature/project_api_avatar_urlJeroen van Baarsen2015-03-011-0/+1
|\ \ \ | |_|/ |/| |
| * | Expose avatar_url in projects APIsue4452015-03-011-0/+1
* | | Merge branch 'master' into mmonaco/gitlab-ce-api-user-noconfirmDmitriy Zaporozhets2015-02-2792-422/+2224
|\ \ \ | |/ /
| * | Merge branch 'bitbucket-import'Dmitriy Zaporozhets2015-02-2511-15/+249
| |\ \
| | * | Satisfy Rubocop.Douwe Maan2015-02-241-2/+2
| | * | Delete deploy key from Bitbucket after importing.Douwe Maan2015-02-243-6/+38
| | * | Fix specs.Douwe Maan2015-02-241-1/+1
| | * | Load public key in initializer.Douwe Maan2015-02-242-3/+12
| | * | Add Bitbucket importer.Douwe Maan2015-02-249-15/+208
| | |/
| * | Web Editor: save to new branchValery Sizov2015-02-242-4/+12
| |/
| * Merge branch 'api-empty-commit' into 'master'Dmitriy Zaporozhets2015-02-243-7/+28
| |\
| | * Improve error messages when file editing failsVinnie Okada2015-02-223-7/+28
| * | Fix git-over-httpDmitriy Zaporozhets2015-02-231-0/+1
| |/
| * Merge branch 'master' into rails-4.1.9Vinnie Okada2015-02-217-3/+184
| |\
| | * Merge branch 'mr-commit-comment-diff-lines' into 'master'Dmitriy Zaporozhets2015-02-211-1/+1
| | |\
| | | * Fix commit comments on first line of diff not rendering in Merge Request Disc...Douwe Maan2015-02-201-1/+1
| | * | Merge branch 'go-get-workaround-nginx' of https://github.com/mattes/gitlabhq ...Marin Jankovski2015-02-202-0/+20
| | |\ \
| | | * | remove optional html tagsmattes2014-12-312-12/+2
| | | * | allow for private repositoriesmattes2014-12-312-0/+30
| | * | | Merge branch 'upload-xss-access-control' into 'master'Marin Jankovski2015-02-203-2/+58
| | |\ \ \
| | | * | | Restore nginx config a little more.Douwe Maan2015-02-202-0/+2
| | | * | | Make changes to nginx config less likely to break something.Douwe Maan2015-02-202-35/+66
| | | * | | Satisfy Rubocop.Douwe Maan2015-02-201-1/+1
| | | * | | Use modified ActionDispatch::Static to let uploads go through to routes.Douwe Maan2015-02-201-0/+13
| | | * | | Modify nginx config to let /uploads go through to unicorn.Douwe Maan2015-02-202-37/+47
| | | | |/ | | | |/|
| | * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-02-202-0/+102
| | |\ \ \
| | | * | | Add gitorious.org importerMarcin Kulik2015-02-202-0/+102
| | | |/ /