Update merge_status state to allow more transitions

Previously you could only transition from the unchecked state to one of the others. This meant that the mark_as_unmerged call in AutoMergeService would rarily be able to actually transition the state. As it would usually have already been set to can_be_merged before it hit that service.

Spec and Spinach tests have been run locally and all pass.

See merge request !405

[security] gems update

[doorkeeper] added filtering of sensitive information (like secret key) from production.log

[gollum lib] remote code execution (in search field). We don't have search for wiki but it is better to have this fix.

Nothing critical!!!

related to #2143

See merge request !1732

This reverts commit 00607d4f, reversing
changes made to edfc7d0d.

New branch

See merge request !406

Add error message when have error on profile screen

Revert "Increase timeout for Git-over-HTTP requests."

This reverts commit 516bcabb.

For #2164

cc @marin @douwe

See merge request !1730

This reverts commit d70126c1.

This reverts commit 516bcabb.

Conflicts:
	Gemfile

Remove mention of branch to commit to when new file is added through UI

See merge request !1731

Fix small grammar issue on projects show page

Make MR and issue numbers clickable links in MR and issue lists.

Fix cross-references that contain underscores

### What does this MR do?

Cross-references that contain underscores confuse the Markdown renderer and don't work properly. For example:

1. In  `myacct/project_one#456`, add a comment that includes a reference to `myacct/project_two#123`.
2. The comment in `myacct/project_one#456` links correctly.
3. The system note in `myacct/project_two#123` is incorrectly linked as:

`mentioned in issue myacct/projectone#456_`

This MR removes the use of the `_` character in the system notes to prevent Markdown confusion.

See a full discussion in #1160.

### Are there points in the code the reviewer needs to double check?

To preserve backwards compatibility with existing system notes, there is a SQL wildcard match for notes having underscores. This seemed safer than migrating all notes.

### Why was this MR needed?

In an ideal world, the Markdown parser would be able to handle references containing underscores with or without escape sequences. However, there are a number of issues:

1. RedCarpet's parser for emphasis block is pretty dumb: it treats `#` as a word break and thus even the `intra_word_emphasis` flag has no effect.
2. The parser is in C and can't be changed easily.
3. There is no way to insert an escape sequence for emphasis blocks.

The only way around this is to switch to something like CommonMark, which does support escape sequences.

### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)?

Issue #1160

### Screenshots

Before:

![Screen_Shot_2015-03-19_at_1.39.29_AM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/a1db4b96c0df2f10d9855ed5abe976ca/Screen_Shot_2015-03-19_at_1.39.29_AM.png)

After:

![Screen_Shot_2015-03-19_at_1.39.35_AM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/189a062c2d19645eec1782ac1f0d4f2f/Screen_Shot_2015-03-19_at_1.39.35_AM.png)

See merge request !385

Update poltergeist to support phantomjs 2.0

In response to [my issue](https://gitlab.com/gitlab-org/gitlab-development-kit/issues/36) on the GDK.
PhantomJS 1.8 was not in the repo's anymore. Only poltergeist needed it, but they support PhantomJS 2.0 since 1.6.0. (next release since 1.5.1) [Their CHANGELOG](https://github.com/teampoltergeist/poltergeist/blob/master/CHANGELOG.md).

Tested locally with Ruby 2.1.5. As this took ages, I haven't tested further.

See merge request !403

Fixed rake task gitlab:cleanup:block_removed_ldap_users

Maybe not the most elegant solution, but it works for us.

This closes issue gitlab-org/gitlab-ce#955.

See merge request !338

Previously you could only transition from the unchecked state to one of the others. This meant that the mark_as_unmerged call in AutoMergeService would rarily be able to actually transition the state. As it would usually have already been set to can_be_merged before it hit that service.

Move "Import existing repository by URL" option to button.

The "Import existing repository URL" (with or without form visible) looked out place with the new import buttons. I moved it to a button, and moved the form to below the buttons.

@dzaporozhets Would be nice to have in 7.9 since the moved buttons are in there as well.

Before:

![Screen_Shot_2015-03-19_at_15.08.04](https://dev.gitlab.org/gitlab/gitlabhq/uploads/6ac26467ede65a4f31d004c227fdbc3e/Screen_Shot_2015-03-19_at_15.08.04.png)

After:

![Screen_Shot_2015-03-19_at_15.42.56](https://dev.gitlab.org/gitlab/gitlabhq/uploads/a73bd7d09b7a33f58067a3bd0d7f604a/Screen_Shot_2015-03-19_at_15.42.56.png)

("publically" typo has been fixed to "publicly")

See merge request !1728

Add canceled CI status

Fixes https://github.com/gitlabhq/gitlab-ci/issues/564

https://dev.gitlab.org/gitlab/gitlab-ci/issues/169

![Screen_Shot_2015-03-19_at_17.10.08](https://dev.gitlab.org/gitlab/gitlabhq/uploads/87f47d9fd1b1a60e0c5402eedd1a1566/Screen_Shot_2015-03-19_at_17.10.08.png)

See merge request !1729

fix(style): align navbar-toggle

Changes:
- change `.navbar-toggle` from `margin: 0 -15px 0 0;` to `margin: 0;`

## Before:
- 320x480 ![Screen_Shot_2015-03-19_at_03.43.53](https://gitlab.com/kingcody/gitlab-ce/uploads/376727af07cf62eec5609c01bbbdaacf/Screen_Shot_2015-03-19_at_03.43.53.png)

- 360x640 ![Screen_Shot_2015-03-19_at_03.44.04](https://gitlab.com/kingcody/gitlab-ce/uploads/d5318de4f45687154d90c54f0bece2aa/Screen_Shot_2015-03-19_at_03.44.04.png)

## After:
- 320x480 ![Screen_Shot_2015-03-19_at_03.45.21](https://gitlab.com/kingcody/gitlab-ce/uploads/20f526c9ef19c2c30add001b15c06358/Screen_Shot_2015-03-19_at_03.45.21.png)

- 360x640
![Screen_Shot_2015-03-19_at_03.45.27](https://gitlab.com/kingcody/gitlab-ce/uploads/e60e9dde1f86d89adf36480e7fcc611d/Screen_Shot_2015-03-19_at_03.45.27.png)

See merge request !402

Only trigger search if search string is present

This is a follow up for !296 to prevent the search function from being executed while the query is nil.

Problem was this:
When the search is called, the search controller gets 2 requests.
```
{"action"=>"show", "controller"=>"search"}
```
and
```
{"utf8"=>"✓",
 "search"=>"proj",
 "project_id"=>"",
 "group_id"=>"",
 "snippets"=>"",
 "scope"=>"",
 "button"=>"",
 "action"=>"show",
 "controller"=>"search"}
```

Obviously it doesn't make sense to execute the search for the first request, since that one doesn't have a scope or a search string.

Please review this carefully since this modifies the search and may break things i can't think of.

@dzaporozhets While this fixes the root cause for the failing test, I think we should keep your fix in as a failsafe. What do you think of this?

See merge request !302

Backup repo with tar instead of git bundle

Fixes gitlab/gitlab-ee#246

See merge request !1723

Fewer Git constants, more Git helpers.

See merge request !1727

Remove emphasis from system notes to avoid Markdown conflicts in names.