delta/gitlab/gitlab-ce.git, branch web-editor-autocrlf

Convert CRLF newlines to LF when committing using the web editor.

2015-06-20T12:35:24+00:00

Merge branch 'new-mr-disable-change-target-branch' into 'master'

2015-06-20T10:41:07+00:00

Disable changing of target branch in new merge request page when a branch has already been specified

### What does this MR do?

This MR prevents a user from changing the target branch inside a new merge request page if the target branch has already been specified (e.g. from the shortcut in the activity feed). A link to "Change branches" is provided to allow the user to do this properly.

### Why was this MR needed?

If a user attempted to create a merge request from a shortcut with a pre-specified target branch (e.g. `master`), the dropdown would suggest that the user could change the branch. However, this did not actually work due to duplicate data elements (see #1830 for more details), and the target branch would always be set to the original, default branch. This would lead to confusion, potentially causing an improper merge request to be created.

### What are the relevant issue numbers?

Closes #1830

### Screenshot

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/eeec4f5d4b66625a14be41e5ecbdc016/image.png)

See merge request !846

Merge branch 'fix-error-500-internal-snippet' into 'master'

2015-06-20T10:38:33+00:00

Fix Error 500 when one user attempts to access another's personal, internal snippet

### What does this MR do?

This MR fixes an Error 500 that occurred if one user tried to access another's personal, internal snippet. Steps to reproduce:

### Why was this MR needed?

1. Go to `/snippets/new`.
2. Select "Internal".
3. Create a snippet. Save the URL (e.g. `/snippets/20`)
4. Logout and sign in as another user.
5. Go to the URL in step 3.

### What are the relevant issue numbers?

Closes #1815

See merge request !854

Merge branch 'sshdoc' into 'master'

2015-06-20T10:04:30+00:00

Include non-default ssh key location info

Fixes #875

Provide help for people who aren't SSH-clued by indicating
how to point to key files that have been named something
other than the default. A lot of people seem to assume that
the filename they choose is irrelevant and then wonder why
their private key is not being found by simple 'ssh' commands.

See merge request !507

Fix Error 500 when one user attempts to access a personal, internal snippet

2015-06-20T04:23:46+00:00

Closes #1815

Disable changing of target branch in new merge request page when a branch has already been specified

2015-06-19T22:39:56+00:00

Closes #1830

Merge branch 'rs-blobview-js-refactor' into 'master'

2015-06-19T21:27:25+00:00

Refactor and spec line highlighting Javascript

- Replaces the fragile Spinach tests for this feature with Jasmine tests
- The "Don't scroll the page when we click a line number" behavior now works as expected

See merge request !820

Minor style fixes for LineHighlighter

2015-06-19T20:43:09+00:00

Merge branch 'rs-dev-issue-2415' into 'master'

2015-06-19T20:10:19+00:00

Show user 2FA status on Admin::Users#show

| Enabled | Disabled |
| ------- | -------- |
| ![Screen_Shot_2015-06-19_at_2.58.42_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b81f6a992366105c14e03852385b28f0/Screen_Shot_2015-06-19_at_2.58.42_PM.png) | ![Screen_Shot_2015-06-19_at_2.58.30_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7bb8fd11b6c27615eef19154ffabe2de/Screen_Shot_2015-06-19_at_2.58.30_PM.png) |

Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2415

See merge request !851

Use User#two_factor_enabled instead of otp_required_for_login

2015-06-19T19:14:37+00:00