# Conflicts:
#	package.json
#	yarn.lock

[ci skip]

CE upstream - 2018-07-14 00:21 UTC

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

EE Port of "Upgrade webpack and other frontend deps"

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

Upgrade webpack and other frontend deps

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

update several webpack loaders and plugins

upgrade nodemon

upgrade karma

upgrade karma-webpack

update karma-jasmine to fix broken reporter timer

Resolve "Improve log output of jasmine `toEqual` diffs"

Closes #49128

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

Add missing sourceBranchLink prop to CI widget

Closes #6897

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

Backport logger changes from EE

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

CE upstream - 2018-07-13 21:21 UTC

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

This resolves the issues identified in https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/81699184.

Fix ee-specific-check when EE is up-to-date with CE branch

Closes #6890

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

Resolve "Lazy-load performance bar in frontend"

Closes #48673

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

CE upstream - 2018-07-13 15:22 UTC

Closes #6895

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

Allow merge requests from forks to be opened in Web IDE

Closes #47460

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

Improve project build time setting validation

Closes #44443

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

Fix RSS button interaction on Dashboard, Project and Group activities

Closes #48894

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

Avoid process deadlock in popen by consuming input pipes

Closes gitlab-ee#6895

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

Add missing `CI_COMMIT_BEFORE_SHA` predefined variable

Closes #43365

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

We need to eagerly load the performance bar wrapper component
(`performance_bar/index.js`) when the page is loaded and the container element
is present, to ensure that we register the interceptor early enough in the
page's lifecycle.

However, we don't need to load the UI at that point. Not doing so means that we
can let Webpack extract the UI (`performance_bar/components/*`) into its own
chunk, so users who don't see the performance bar don't have to load too much
unnecessary JavaScript.

CE upstream - 2018-07-13 09:21 UTC

Closes gitaly#526, gitaly#965, gitaly#476, and gitaly#474

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

Open pipeline list panel when clicking CI icon in Web IDE

Closes #47843

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

CE upstream - 2018-07-13 06:32 UTC

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

Fix Boards::UsersFinder usage inside EE namespace

Closes #6865

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

Update docs board features tier

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

Update docs board features tier

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

Update doc to note that board update API is available after 11.1.

Closes #6892

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

doesnt add query param if source & target projects match

Make more ref RPC's mandatory

Closes gitaly#526, gitaly#965, gitaly#476, and gitaly#474

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