summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |/ /
| * | | Extend project web hooks with more dataDmitriy Zaporozhets2015-02-201-0/+3
| |/ /
* | | Merge branch 'master' into rails-4.1.9Vinnie Okada2015-02-196-10/+16
|\ \ \ | |/ /
| * | Revert "Fix broken access control and refactor avatar upload"Dmitriy Zaporozhets2015-02-192-29/+13
| * | Merge branch 'access-check-when-signed-out' into 'master'Dmitriy Zaporozhets2015-02-181-0/+2
| |\ \
| | * | Fix push access check when not signed in.Douwe Maan2015-02-181-0/+2
| * | | Improve broadcast message APIDmitriy Zaporozhets2015-02-182-2/+4
| * | | Dont send 404 if no broadcast messages now because it flood gitlab-shell logs...Dmitriy Zaporozhets2015-02-181-2/+0
| * | | DB performance improvements to GitLabDmitriy Zaporozhets2015-02-181-5/+9
| |/ /
| * | Remove Group#owner_id from API since it is not used any moreDmitriy Zaporozhets2015-02-172-2/+2
| * | Fix broken access control and refactor avatar uploadHannes Rosenögger2015-02-162-13/+29
* | | Upgrade to Rails 4.1.9Vinnie Okada2015-02-143-10/+16
|/ /
* | Allow users that signed up via OAuth to set their password in order to use Gi...Douwe Maan2015-02-131-5/+6
* | Merge branch 'clean-oauth-username' into 'master'Dmitriy Zaporozhets2015-02-131-5/+5
|\ \
| * | Clean username acquired from OAuth/LDAP.Douwe Maan2015-02-121-5/+5
* | | Merge branch 'issues_tracker_template' into 'master'Dmitriy Zaporozhets2015-02-121-1/+1
|\ \ \
| * | | Add ExternalIssue base model to make issue referencing more robust for extern...Marin Jankovski2015-02-111-1/+1
| |/ /
* | | Edit group members via APIVinnie Okada2015-02-113-10/+31
|/ /
* | Merge branch 'add_label_notes' into 'master'Dmitriy Zaporozhets2015-02-112-4/+25
|\ \
| * | Add labels notesNikita Verkhovin2015-02-082-4/+25
* | | Add internal broadcast message API.Douwe Maan2015-02-072-0/+12
|/ /
* | Merge branch 'mention-groups'Dmitriy Zaporozhets2015-02-061-2/+9
|\ \
| * | Allow groups to be mentioned.Douwe Maan2015-02-051-2/+9
* | | Merge branch 'api-default-order' into 'master'Dmitriy Zaporozhets2015-02-064-60/+72
|\ \ \
| * | | Refactor and improve sorting objects in API for projects, issues and merge re...Dmitriy Zaporozhets2015-02-054-58/+72
| * | | Explicitly define ordering in models using default_scopeDmitriy Zaporozhets2015-02-051-2/+0
* | | | GitHub importer refactoringValery Sizov2015-02-052-10/+32