summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ldap-unblock-user' into 'master'Dmitriy Zaporozhets2015-03-131-0/+1
|\
| * Unblock user if they were unblocked in AD.Douwe Maan2015-03-131-0/+1
* | Merge branch 'tag-branch-hooks' into 'master'Dmitriy Zaporozhets2015-03-131-1/+2
|\ \
| * | Set push data object kind in PushDataBuilder.Douwe Maan2015-03-131-1/+2
| |/
* | Fix import pages not working after first load.Douwe Maan2015-03-133-3/+3
|/
* Block user if he/she was blocked in Active DirectoryDmitriy Zaporozhets2015-03-121-1/+8
* Add blue theme to GitLabDmitriy Zaporozhets2015-03-111-1/+3
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-111-0/+1
|\
| * Merge branch 'generate-valid-json' into 'master'Hannes Rosenögger2015-03-111-0/+1
| |\
| | * Generate valid json for hooksNicole Cordes2015-03-101-0/+1
* | | Merge branch 'ldap-filter-eq' into 'master'Dmitriy Zaporozhets2015-03-112-1/+3
|\ \ \ | |/ / |/| |
| * | Escape wildcards when searching LDAP by username.Douwe Maan2015-03-062-1/+3
* | | Use Gitlab::Git helper methods and constants as much as possible.Douwe Maan2015-03-103-10/+27
| |/ |/|
* | Automatically link commit ranges to compare page.Douwe Maan2015-03-072-4/+40
* | 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-031-24/+28
|\ \ \ | |/ / |/| |
| * | Don't leak information about private project existence via Git-over-SSH/HTTP.Douwe Maan2015-03-021-24/+28
* | | 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
* | | Support names starting with a digit or _ for projects and usersNicolas Bouilleaud2015-03-021-1/+1
| |/ |/|
* | 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-242-6/+26
|\
| * Improve error messages when file editing failsVinnie Okada2015-02-222-6/+26
* | Fix git-over-httpDmitriy Zaporozhets2015-02-231-0/+1
|/
* Merge branch 'master' into rails-4.1.9Vinnie Okada2015-02-215-1/+119
|\
| * 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 'upload-xss-access-control' into 'master'Marin Jankovski2015-02-201-0/+13
| |\ \
| | * | 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
| | |/
| * | 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-192-5/+11
|\ \ | |/
| * 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
| * | DB performance improvements to GitLabDmitriy Zaporozhets2015-02-181-5/+9
| |/