CE upstream



See merge request !183

Fix Weight display in Issuables' collapsed sidebar

Fixes #284.

/cc @jschatz1 

### No weight set

![Screen_Shot_2016-02-15_at_16.02.59](/uploads/3a46684f90531fe1e319a17147272c10/Screen_Shot_2016-02-15_at_16.02.59.png)

---

### Weight set

![Screen_Shot_2016-02-15_at_16.03.18](/uploads/24accd1e795d16f4802ea1f0fe98f588/Screen_Shot_2016-02-15_at_16.03.18.png)

See merge request !184

Fix undefined method `postgresql?` during migration

See merge request !2820

Improved LDAP documentation about the use of multiple servers [ci skip]

cc @ernstvn

See merge request !177

[ci skip]

Add notice about offline migrations

/cc @sytses 

See merge request !1723

Fix duplicate "me" in tooltip of the "thumbsup" awards Emoji

Steps to reproduce:

1. Go to a MR or issue
2. Click on "thumbsup" Emoji 3 times
3. Observe the tooltip becomes "me, me"

Closes #13374, #12788

See merge request !2804

Fix EE builds

If we specify a new `services` in context of `job` we need to specify all used services, because they overwrite what is specified in global context.

It did not fail for some builds, because we still have mixed infrastructure: Some runners do have pre-configured mysql, postgres and redis in their environment.

All future runners will be migrated to drop the pre-configured services.

/cc @vsizov 


See merge request !176

Improve error message for prohibited filenames

Will fix #202

See merge request !162

Update omniauth to 1.3.1 for memory performance

OmniAuth 1.3.1 may improve memory performance (~ 70% according to [intridea/omniauth!774](https://github.com/intridea/omniauth/pull/774)).

Closes #2404.

See merge request !2805

Fix Elasticsearch blob results linking to the wrong reference ID

If Elasticsearch returned a hit for a blob, clicking on the link would
always return a 404 since the OID, not the commit SHA, was being used.

See merge request !181

Fix broken link in CI build notification emails

Closes #13199

See merge request !2785

Fix relative links in other markup formats

_Originally opened at !1845 by @ben.boeckel._

- - -

The RelativeLinkFilter was not applied to other document formats, e.g.,
reStructuredText, so links from the Files view or the Project view did
not work.

Fixes #3533.

See merge request !2798

Steps to reproduce:

1. Go to a MR or issue
2. Click on "thumbsup" Emoji 3 times
3. Observe the tooltip becomes "me, me"

Closes #13374, #12788

If Elasticsearch returned a hit for a blob, clicking on the link would
always return a 404 since the OID, not the commit SHA, was being used.

Remove note on backing up GitLab CI as a separate service

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/13405

See merge request !2803

[ci skip]

Fix duplicated branch creation/deletion Web hooks/service notifications when using Web UI

Similar to 423d2d62, except duplicates occurred only if a Web service (e.g. Slack) were
configured.

When deleting a branch, this is what was happening:

    1. DeleteBranchService calls execute_hooks and execute_services
    2. The call to repository.rm_branch triggers the GitHooksService.
    3. This, in turn, calls GitPushService and then calls the same hooks/services again.

5145706c now makes it no longer necessary for DeleteBranchService and CreateBranchService to execute
the branch hooks/services. Note that tags behave differently in GitTagPushService and GitPushService
is not called.

Closes #10330

See merge request !2763

Don't try to mark broken MR as mergable

In case merge request is broken, we shouldn't check if the sha
is mergable, as it will be null, and there's no point, as we know
that it's not mergable.

See merge request !2783

Correct indentation for `issues/merge_requests` partial render

Prior, it would only be shown if the issue had been edited.

See merge request !2789

- Apply the RelativeLinkFilter filter to other formats, e.g.,
  reStructuredText so links from the Files view or the Project view work
- Remove the AsciidocPipeline pipeline

Fixes #3533.

Remove deprecated SSL warning on web hooks documentation

Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/289

See merge request !178

[ci skip]