CE upstream - 2018-10-12 04:27 UTC

See merge request gitlab-org/gitlab-ee!7902

CE upstream - 2018-10-11 22:21 UTC

See merge request gitlab-org/gitlab-ee!7900

Specification change: Fix asciidoctor block context.

See merge request gitlab-org/gitlab-ce!22280

Fix broken file name navigation on MRs

Closes #50185

See merge request gitlab-org/gitlab-ce!22109

4. enable jasmine/prefer-jasmine-matcher

See merge request gitlab-org/gitlab-ce!22236

4. enable jasmine/prefer-jasmine-matcher

See merge request gitlab-org/gitlab-ee!7888

CE upstream - 2018-10-11 20:38 UTC

See merge request gitlab-org/gitlab-ee!7896

Don't synchronize default branch when updating a SSH mirror

See merge request gitlab-org/gitlab-ee!7891

1. enable jasmine/new-line-between-declarations

See merge request gitlab-org/gitlab-ce!22230

1. enable jasmine/new-line-between-declarations

See merge request gitlab-org/gitlab-ee!7871

Fix erased block not being rendered when job was erased

Closes #52570

See merge request gitlab-org/gitlab-ce!22294

CE upstream - 2018-10-11 17:03 UTC

Closes gitlab-qa#257 and gitlab-org/release/framework#17

See merge request gitlab-org/gitlab-ee!7890

Disable the default branch update if SSH project mirrors are
being used for now, since it is affecting GitLab.com users

# Conflicts:
#	.rubocop.yml
#	doc/ci/triggers/README.md

[ci skip]

CE upstream - 2018-10-11 10:21 UTC

Closes gitaly#1319

See merge request gitlab-org/gitlab-ee!7882

Update copy to clipboard button data for application secret

Closes #52572

See merge request gitlab-org/gitlab-ce!22268

Fix project deletion when there is a export available

Closes #52362

See merge request gitlab-org/gitlab-ce!22276

Support pushing of feature flags to the frontend

Closes gitlab-org/release/framework#17

See merge request gitlab-org/gitlab-ce!22197

Adds `.json` to the end of pipelines endpoint

Closes #52472

See merge request gitlab-org/gitlab-ce!22293

Stuck block URL links to runners settings

Closes #52519

See merge request gitlab-org/gitlab-ce!22286

This adds a method to Gitlab::GonHelper called
`push_frontend_feature_flag`. This method can be used to easily expose
the state of a feature flag to Javascript code. For example, using this
method we may write the following controller code:

    before_action do
      push_frontend_feature_flag(:vim_bindings)
    end

    def index
      # ...
    end

    def edit
      # ...
    end

In Javascript we can then check the state of the flag as follows:

    if ( gon.features.vimBindings ) {
      // ...
    }

Fixes https://gitlab.com/gitlab-org/release/framework/issues/17

Enable even more frozen string in lib/**/*.rb

See merge request gitlab-org/gitlab-ce!22206

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

Feature improved branch filter sorting

See merge request gitlab-org/gitlab-ce!22166

Instance SAML SSO e2e test

Closes gitlab-qa#257

See merge request gitlab-org/gitlab-ce!22271

Port of qa-257-instance-wide-saml-sso to EE

See merge request gitlab-org/gitlab-ee!7881

Add new sort option "most_stars" to "Group > Children" pages

See merge request gitlab-org/gitlab-ce!22121

When the job page is rendered we fetch the pipeline
endpoint to render the stages in the sidebar.
Without `.json` the response is cached, and when the
user goes back to the pipeline's page it renders the
json output instead of the Vue app