Conflicts:
	app/views/layouts/_page.html.haml

EE: Avoid expect_any_instance_of because it doesn't work

See merge request !2559

well with prepend. We need to backport this

EE Version of inline-js-removal-projects-other

See merge request !2549

Port "Follow-up from "Allow to use cross project pipelines" ver 2" to EE

See merge request !2555

[EE] Moves the Performance Bar to the top instead of being at the bottom

See merge request !2472

commit dca9bd9e
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Fri Jul 28 18:46:04 2017 +0900

    Expand pipeline_trigger_service_spec by godfat request

commit 2ea6915e
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Fri Jul 28 18:16:46 2017 +0900

    Fix revert miss

commit 276c44bf
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Fri Jul 28 00:38:26 2017 +0900

    Fix static snalysys

commit 8c4c310d
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Fri Jul 28 00:33:41 2017 +0900

    Revert "Move validate to begin/rescue block"

    This reverts commit 5ec3b63bfc6f341df040ae08be4858c7181bcacf.

commit b59abf5b
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Fri Jul 28 00:31:24 2017 +0900

    Use let(:params) instead of def param

commit 34d2b8e7
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Thu Jul 27 23:09:30 2017 +0900

    Use let(:pipeline) for variables spec in triggers_spec.rb

commit a2a7fc1f
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Thu Jul 27 22:47:18 2017 +0900

    Remove is_a?(Hash) from unless params[:variables] in create_pipeline_variables

commit 445f2135
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Thu Jul 27 22:44:53 2017 +0900

    Use bang for trigger.trigger_requests.create

commit b3b8b595
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Thu Jul 27 22:41:21 2017 +0900

    Remove if pipeline.variables in Ci::Build#variables

commit 48389e99
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Thu Jul 27 15:52:55 2017 +0900

    Fix pipeline

commit 19789154
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Wed Jul 26 22:58:31 2017 +0900

    Move validate to begin/rescue block

commit 1ad4efe6
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Wed Jul 26 18:44:49 2017 +0900

    fix merge miss

commit 56418e85
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Wed Jul 26 18:31:09 2017 +0900

    init

Fix remote mirror last_update_at nil error in view

See merge request !2542

Signed-off-by: Rémy Coutable <remy@rymai.me>

Adds restrict group owners to admins option to admin application settings dashboard

Closes #918

See merge request !2529

Replace autodeploy guide image to use blank namespace

Closes #3025

See merge request !2552

EE: Merge issuable "reopened" state into "opened"

See merge request !2492

Make access level for protected tag factories less conflicting

See merge request !2553

[ci skip]

[ci skip]

EE port of ph-inline-js

See merge request !2543

Having two states that essentially mean the same thing is very much like
having a boolean "true" and boolean "mostly-true": it's rather silly.
This commit merges the "reopened" state into the "opened" state while
taking care of system notes still showing messages along the lines of
"Alice reopened this issue".

A big benefit from having only two states (opened and closed) is that
indexing and querying becomes simpler and more performant. For example,
to get all the opened queries we no longer have to query both states:

    SELECT *
    FROM issues
    WHERE project_id = 2
    AND state IN ('opened', 'reopened');

Instead we can query a single state directly, which can be much faster:

    SELECT *
    FROM issues
    WHERE project_id = 2
    AND state = 'opened';

Further, only having two states makes indexing easier as we will only
ever filter (and thus scan an index) using a single value. Partial
indexes could help but aren't supported on MySQL, complicating the
development process and not being helpful for MySQL.

`{ default_access_level: false }` instead. This would work
better with CE codes

[EE] Use `:empty_project` where possible in feature specs

See merge request !2546

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

Add license check before enabling extra features for LDAP

Closes #2844

See merge request !2513

CE upstream - Wednesday

Closes omnibus-gitlab#2612

See merge request !2527