delta/gitlab/gitlab-ce.git/spec/controllers, branch gitlab-git-http-server

Remove user OAuth tokens stored in database for Bitbucket, GitHub, and GitLab

2015-08-23T16:23:44+00:00

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

Merge branch 'fix-email-autocomplete' into 'master'

2015-08-21T22:25:59+00:00

Fix bug preventing invite by e-mail

This was broken in 70f5291808 as a result of introducing the ability to filter by current user.

Closes #2320

See merge request !1181

Fix bug preventing invite by e-mail

2015-08-21T20:47:56+00:00

This was broken in 70f5291808 as a result of introducing the ability to filter by current user.

Closes #2320

Fix blame view line groupings

2015-08-20T08:27:29+00:00

Closes #2305

Merge branch 'disable-internal-tracker-when-external-in-use' into 'master'

2015-08-14T11:01:43+00:00

Disable internal issue tracker if external tracker in use

### What does this MR do?

This MR disables routes to the internal issue tracker if an external issue tracker (e.g. Redmine) is in use. A 404 page is returned if a user attempts to access any of the issue routes.

### Why was this MR needed?

Enabling the external issue tracker would still keep the internal one active, which would lead to odd behavior where users could create issues but not close them.

### What are the relevant issue numbers?

Closes #2006

See merge request !993

Provide more feedback what went wrong if HipChat service failed test

2015-08-12T14:31:25+00:00

Issue gitlab-com/support-forum#213

Show incompatible projects in Bitbucket import status

2015-08-07T14:07:08+00:00

See #1871

Merge branch 'add-current-user-to-autocomplete' into 'master'

2015-08-06T16:10:38+00:00

Always add current user to autocomplete controller to support filter by "Me"

### What does this MR do?

This MR always adds the current user to the autocomplete list of users.

### Why was this MR needed?

Normally only the members from a team or the group are shown in the autocomplete list. However, this prevents a user from filtering issues belong to him/her if the user does not belong directly to either. To make this filtering more usable, we can be sure to add the current user to the list, which the JavaScript code will move to the top of the list.

### What are the relevant issue numbers?

Partial fix #2202

See merge request !1100

Merge branch 'remove-email-from-published-keys' into 'master'

2015-08-06T09:05:15+00:00

Only publish ssh key-type and key

Now when requesting my keys; my emailadres is exposed. [My keys](https://gitlab.com/zj.keys)

To prevent harvesting only key-type and the key itself are displayed instead of all data supplied when uploaded.

See merge request !850

Merge branch 'fix-branch-errors-with-encoded-slashes' into 'master'

2015-08-06T08:29:18+00:00

Fix errors deleting, creating, and viewing graphs using branches with encoded slashes

* Closes #1804
* Closes #1359

See merge request !1084