fix stuck mr

If `locked?` & `locked_at.nil?` is nil return that the merge has been locked long enough and those are old merges stuck in locked state.

Fixes #348. Related to 64874193. Replaces !517.

/cc @DouweM

See merge request !526

Revert help link

Revert for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/483

cc @douwe

See merge request !1776

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

This reverts commit 6fe26e3e.

Import projects from Google Code.

Resolves #1257.

Issue import logic almost entirely taken from https://gitlab.com/o9000/google-code-to-gitlab ( ♥ @o9000).

### To do

- [x] List projects from Google Takeout file
- [x] Import Git repository
- [x] Import issues
- [x] Link to correct attachment URL (https://code.google.com/p/support-tools/issues/detail?id=50)
- [x] Handle deleted attachments
- [x] Handle blockedOn attribute
- [x] Add directions on how to get data from Google Takeout

### Import instructions

![Screen_Shot_2015-04-03_at_16.02.21](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4a87038035fbad9441cf613b8cdcc690/Screen_Shot_2015-04-03_at_16.02.21.png)

### Imported issue

![Screen_Shot_2015-04-03_at_16.25.49](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b2c2eaf5ecfcf57b3c48511eb5d26db4/Screen_Shot_2015-04-03_at_16.25.49.png)

See merge request !471

Remove truncation from issue titles on milestone page

fixes #348. related to 64874193.

Remove timing dependency on unsubscribe merge request test

This test failed for me once. I am now on a mission to remove `sleep` from the spinach tests.

See: http://www.elabs.se/blog/53-why-wait_until-was-removed-from-capybara

See merge request !523

See: http://www.elabs.se/blog/53-why-wait_until-was-removed-from-capybara

Fix ldap migration

We need different queries for MySQL and Postgres.

See merge request !1771

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

Ui improvements

See merge request !1772

Fix error message

This merge request fixes issue when somebody try to import repository (to which that user can't add deploy keys) and has no feedback.

See merge request !518

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

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

I could not help myself

I could not find a query that worked on both; these two queries look
very similar and seem to do the same thing.

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

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

Fix directory traversal vulnerabilities

Fixes gitlab/gitlab-ee#272.

As @joern mentions:

> This is not exploitable via the front-end nginx. But nevertheless this issue should be addressed.

See merge request !1760

Allow user to choose which email to be public

This commit allows user to show one of their emails in profile page,
or don't show email in this page.

This reverts commit 79b4d0b0, reversing
changes made to a1e147ce.

Revert "Merge branch 'fix_email_images' into 'master'"

This reverts commit d66148ef, reversing
changes made to cdb64a81.

This change needed to be reverted,
because not enough email clients support inline images.

/cc @DouweM As discussed before. I'll try to create a MR to allow access to all images this week. I'm a bit busy at the moment so no guarantees. ;)

See merge request !513

Fix wrong merged changelog entries

See merge request !514

fix stuck MR

If `locked_at` is `nil` return that the merge has been locked long enough and those are old merges stuck in locked state.

Fixes #348. Related to 64874193.

See merge request !517