delta/gitlab/gitlab-ce.git/db, branch gitlab-git-http-server gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'master' into joelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993 2015-08-29T18:49:14+00:00 Douwe Maan douwe@gitlab.com 2015-08-29T18:49:14+00:00 fe86c8dfbd81ef21d0d685105397f4bf6048b2f2 






Enable SSL verification for Webhooks
2015-08-26T12:48:31+00:00

Valery Sizov
vsv2711@gmail.com

2015-08-11T06:59:40+00:00

bafffb2d14e1924154d5b7c74c7b3cbcf8c898fd












Remove user OAuth tokens stored in database for Bitbucket, GitHub, and GitLab
2015-08-23T16:23:44+00:00

Stan Hu
stanhu@gmail.com

2015-08-07T07:06:20+00:00

ed1d4fa477789659f9343593bf06d50e70750561

and request them each session. Pass these tokens to the project import data.

This prevents the need to encrypt these tokens and clear them in case they
expire or get revoked.

For example, if you deleted and re-created OAuth2 keys for Bitbucket, you would get
an Error 500 with no way to recover:

```
Started GET "/import/bitbucket/status" for x.x.x.x at 2015-08-07 05:24:10 +0000
Processing by Import::BitbucketController#status as HTML
Completed 500 Internal Server Error in 607ms (ActiveRecord: 2.3ms)

NameError (uninitialized constant Import::BitbucketController::Unauthorized):
  app/controllers/import/bitbucket_controller.rb:77:in `rescue in go_to_bitbucket_for_permissions'
  app/controllers/import/bitbucket_controller.rb:74:in `go_to_bitbucket_for_permissions'
  app/controllers/import/bitbucket_controller.rb:86:in `bitbucket_unauthorized'
```

Closes #1871





and request them each session. Pass these tokens to the project import data.

This prevents the need to encrypt these tokens and clear them in case they
expire or get revoked.

For example, if you deleted and re-created OAuth2 keys for Bitbucket, you would get
an Error 500 with no way to recover:

```
Started GET "/import/bitbucket/status" for x.x.x.x at 2015-08-07 05:24:10 +0000
Processing by Import::BitbucketController#status as HTML
Completed 500 Internal Server Error in 607ms (ActiveRecord: 2.3ms)

NameError (uninitialized constant Import::BitbucketController::Unauthorized):
  app/controllers/import/bitbucket_controller.rb:77:in `rescue in go_to_bitbucket_for_permissions'
  app/controllers/import/bitbucket_controller.rb:74:in `go_to_bitbucket_for_permissions'
  app/controllers/import/bitbucket_controller.rb:86:in `bitbucket_unauthorized'
```

Closes #1871







Issue #993: Fixed login failure when extern_uid changes
2015-08-21T16:36:27+00:00

Joel Koglin
JoelKoglin@gmail.com

2015-07-21T21:03:26+00:00

4d2f36118a3b21b6bb4ee702b98d032967ba463a












Merge branch 'master' into reply-by-email
2015-08-20T19:19:19+00:00

Douwe Maan
douwe@gitlab.com

2015-08-20T19:19:19+00:00

3d51a6d4351c6a15c92762f5710a967374d0c59b












Import sources: settings in the admin interface
2015-08-20T09:28:27+00:00

Artem Sidorenko
artem.sidorenko@telekom.de

2015-08-12T06:13:20+00:00

55dca86b983496a26a3913aead77439edf96afe9












Reply by email POC
2015-08-18T22:46:36+00:00

Douwe Maan
douwe@gitlab.com

2015-08-18T22:46:36+00:00

f76eac56b9d7d4ae61010cddcca68682824b2239












Merge branch 'master' into comment-updated-by
2015-08-07T13:05:17+00:00

Douwe Maan
douwe@gitlab.com

2015-08-07T13:05:17+00:00

ad55f0d6f9ec29026b36ee32ff5fc6081e3793de












Allow users to send abuse reports
2015-08-06T12:03:27+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2015-08-06T12:03:27+00:00

cba7f20dc8614d12e3eeda6e14f454aeb22b9b54

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>





Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>







Show who last edited a comment if it wasn't the original author
2015-07-30T12:45:54+00:00

Douwe Maan
douwe@gitlab.com

2015-07-30T12:45:54+00:00

36bd6c8494d4d1deb09f749a02aa9981c8d3080f