# Conflicts:
#	app/models/user.rb
#	doc/administration/job_artifacts.md
#	doc/ci/variables/README.md
#	doc/user/project/integrations/bamboo.md
#	doc/user/project/issues/index.md
#	doc/user/project/merge_requests/index.md
#	doc/user/project/repository/index.md
#	doc/user/project/settings/index.md

[ci skip]

New Crowdin translations

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

Fix Bamboo CI status not showing for branch plans

Closes #1355

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

Make OperationService RPC's mandatory

Closes gitaly#801, gitaly#779, gitaly#755, gitaly#754, gitaly#727, gitaly#680, gitaly#633, gitaly#547, gitaly#546, and gitaly#541

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

Fix MR diffs created with gitaly_diff_between enabled

Closes gitaly#1256

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

Updated /products links to /pricing

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

Changing /products links to /pricing links to reduce redirects and improve consistency

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

Prune web hook logs older than one month

Closes #46120

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

Remove CarrierWave initializer

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

Don't add bottom 'match' line for deleted files

Closes #48160

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

Resolve "JIRA Development Panel project sync fails for projects with dots in name"

Closes #5868

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

CE upstream - 2018-07-02 09:22 UTC

Closes #5864

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

Geo - Recalculates the checksum for projects up to date

Closes #6773 and #6423

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

Merge branch '6224-extract-ee-specific-files-lines-for-app-views-shared-boards-components' into 'master'

Resolve "Extract EE specific files/lines for app/views/shared/boards/components"

Closes gitlab-ee#6224

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

Merge branch 'ee-6224-extract-ee-specific-files-lines-for-app-views-shared-boards-components' into 'master'

Resolve "Extract EE specific files/lines for app/views/shared/boards/components"

Closes #6224

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

Update left side nav border UI

Closes #46222

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

Add title placeholder for new issues

Closes #48085

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

Fixed last commit author link is blue regression

Closes #48251

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

Add review apps for EE

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

Change path to CI job traces

Closes #47173

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

Update index.md changed "gonna" to "going to be"

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

Add detail around 'Build Key' within the GitLab steps.

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

Doc update for Bamboo Integration with GitLab

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

Update external link icon in merge request widget

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

Resolve "Git LFS: Support for HTTP git push to secondary"

Closes #6195

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

Prep work to support git/git-lfs redirect to primary

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