delta/gitlab/gitlab-ce.git/lib, branch comment-box-changes

Add 2FA status to user admin API

2015-06-24T05:41:59+00:00

Closes https://github.com/gitlabhq/gitlabhq/issues/9391

Merge branch 'split-tests' into 'master'

2015-06-23T15:17:11+00:00

Split rspec and spinach tests in parallel

For https://dev.gitlab.org/gitlab/gitlabhq/issues/2386

See merge request !874

Merge branch 'fix-diff-patch-public-mr' into 'master'

2015-06-23T15:03:00+00:00

Fix downloading of patches on public merge requests when user logged out

### What does this MR do?

This MR makes it possible to download a diff patch on a public merge request when a user is logged out.

### Why was this MR needed?

An Error 500 would result when a user attempted to click on the "Email Patches" or "Plain Diff" button:

```
NoMethodError - undefined method `id' for nil:NilClass:
  lib/gitlab/backend/shell_env.rb:9:in `set_env'
  lib/gitlab/satellite/action.rb:20:in `in_locked_and_timed_satellite'
  lib/gitlab/satellite/merge_action.rb:49:in `diff_in_satellite'
  app/models/merge_request.rb:219:in `to_diff'
  app/controllers/projects/merge_requests_controller.rb:42:in `block (2 levels) in show'
```

### What are the relevant issue numbers?

* Closes #1225
* Closes #1854 (dup)
* Closes #1858 (dup)

See merge request !872

Replace GITLAB with GitLab in rake task descriptions

2015-06-23T14:52:40+00:00

Refactor rake tasks for tests

2015-06-23T14:48:52+00:00

Merge branch 'admin-edit-identities' into 'master'

2015-06-23T14:24:16+00:00

Admin can see, edit and remove user identities

Related to #1415 and https://dev.gitlab.org/gitlab/gitlabhq/issues/2224

Signed-off-by: Dmitriy Zaporozhets 

See merge request !843

Fix downloading of patches on public merge requests when user logged out

2015-06-23T12:34:21+00:00

Closes #1225
Closes #1854
Closes #1858

Fix error when deleting a user who has projects

2015-06-23T11:39:49+00:00

Closes #1856
Closes https://github.com/gitlabhq/gitlabhq/issues/9394

Merge branch 'master' into admin-edit-identities

2015-06-22T16:00:11+00:00

Signed-off-by: Dmitriy Zaporozhets 

Conflicts:
	app/views/admin/users/show.html.haml

Make provider a select for identities form in admin area

2015-06-22T14:53:11+00:00

Signed-off-by: Dmitriy Zaporozhets