[ci skip]

[ci skip]

[ci skip]

[ci skip]

[ci skip]

Absorb gitlab_git

See merge request !1027

Added 8.16 CE to EE guide

See merge request !1036

CE upstream

Closes #1376 and gitlab-ce#26114

See merge request !1014

[ci skip]

[ci skip]

Port of 26226-generate-all-haml-fixtures-within-teaspoon-fixtures-task to EE

See merge request !1028

Squashed commit of the following:

commit f19330e4
Author: Mike Greiling <mike@pixelcog.com>
Date:   Tue Jan 3 16:38:53 2017 -0600

    fix right_sidebar_spec ajax call

commit 7a2a9bb4
Author: Mike Greiling <mike@pixelcog.com>
Date:   Fri Dec 30 18:14:33 2016 -0600

    replace Teaspoon fixture methods with jasmine-jquery methods to reduce dependency on Teaspoon

commit 10d483ea
Merge: 5997a86e df5223de
Author: Mike Greiling <mike@pixelcog.com>
Date:   Thu Jan 5 14:10:43 2017 -0600

    Merge branch 'fix-u2f-fixtures' into 26226-generate-all-haml-fixtures-within-teaspoon-fixtures-task

    * fix-u2f-fixtures:
      generate u2f frontend fixtures dynamically
      force utf-8 encoding for prior to fixture parsing to prevent nokogiri issues
      exclude script type=text/template from dom scrubbing

commit df5223de
Author: Mike Greiling <mike@pixelcog.com>
Date:   Tue Jan 3 14:48:37 2017 -0600

    generate u2f frontend fixtures dynamically

commit 8cee3b1d
Author: Mike Greiling <mike@pixelcog.com>
Date:   Tue Jan 3 15:26:14 2017 -0600

    force utf-8 encoding for prior to fixture parsing to prevent nokogiri issues

commit ca404170
Author: Mike Greiling <mike@pixelcog.com>
Date:   Tue Jan 3 10:46:17 2017 -0600

    exclude script type=text/template from dom scrubbing

commit 5997a86e
Author: Mike Greiling <mike@pixelcog.com>
Date:   Mon Jan 2 13:04:10 2017 -0600

    add CHANGELOG entry for !8384

commit d904335d
Author: Mike Greiling <mike@pixelcog.com>
Date:   Fri Dec 30 18:25:23 2016 -0600

    make projects.json easier to read

commit 7ae2fe13
Author: Mike Greiling <mike@pixelcog.com>
Date:   Fri Dec 30 17:28:51 2016 -0600

    fix dynamic u2f fixtures

commit 5f192c77
Author: Mike Greiling <mike@pixelcog.com>
Date:   Fri Dec 30 15:27:40 2016 -0600

    update all frontend tests to point to precompiled fixtures

commit 6370e326
Author: Mike Greiling <mike@pixelcog.com>
Date:   Fri Dec 30 14:50:07 2016 -0600

    recursively clean compiled fixtures

commit 2373082e
Author: Mike Greiling <mike@pixelcog.com>
Date:   Fri Dec 30 14:47:12 2016 -0600

    create catch-all fixture generator for all static fixtures

commit 4cd962ec
Author: Mike Greiling <mike@pixelcog.com>
Date:   Fri Dec 30 14:46:41 2016 -0600

    allow storage of raw string fixtures

Only fetch repo once on secondary after push

See merge request !1015

Absorb gitlab_git

Closes #24374

See merge request !8447

We will use this hook name in future, but with a better implementation.

Add more push rules to the API

Closes #493 and #948

See merge request !1022

Remove a custom validation in the LDAP Group link API

Closes #972

See merge request !1026

Disable LDAP permission override in project members edit list

Closes #1475

See merge request !1018

The validation is now done by Grape since 16a8b5c6.
Signed-off-by: Rémy Coutable <remy@rymai.me>

Use EE build status badge in README

See merge request !1013

Expose issue weight on the API

Closes #749

See merge request !1023

Prevent 500 error when entering/uploading a license

See merge request !1016

Add tests to cycle analytics

See merge request !1019

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7383

Previously, if an admin clicked 'Upload license' without attaching
or entering a license, a 500 error would occur. Now, we check for
the right param. This also changed the render and return to a
redirect, which is more appropriate.

Closes #1475

ES doc. Add the explanation of what indexing option is

See merge request !1017

Currently, after a push we trigger the 'push' system hook on the
secondary for every ref. This hook performs `git fetch primary
--force`. When a repository with a large number of local refs is pushed
for the first time, git will then try to fetch the entire repository
once for every ref, generating a large amount of network and disk usage
for the temporary packfiles used during the fetch process.

In addition to this, if a fetch fails in the
`GeoRepositoryUpdateWorker`, its temporary packfile will remain present
until the next GC run.

To work around this, define a new 'fetch' hook type. Fake the system
hooks so that this is only called for secondary Geo nodes. Then remove
the fetching from the per-ref update step, and explicitly call the hook
once per push instead.

This means that there is a risk the update step will happen before the
fetch is finished, but it does stop the disk usage problem.