Add missing translations

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

Remove badges from README.md in favor of GitLab badges feature

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

EE: Update rubocop

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

Fix handling of annotated tags when Gitaly is not in use

Closes gitlab-ce#47797

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

* update-rubocop:
  Use stable gitlab-styles and eliminate offenses
  Updates from `rubocop -a`
  Update rubocop to get rid of a warning in other MR

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

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

Append `skip ci` to Crowdin commit messages

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

This is an undocumented feature of the Crowdin configuration.

This will append `[skip ci]` to all commit messages from Crowdin,
avoiding 100s of pipelines to be created.

The pipeline will need to be run manually for these merge requests
instead.

Rails5 fix AttachmentRegistryFinder arel queries

Closes #6742, #6745, and #6743

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

[EE-Port] Updates to the `gettext:updated_check`

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

adds clarity about how Jira Dev Panel integration works

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

adds example of pull mirror curl command

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

Fix conflicts for  app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue

Make all Gitaly diff flags mandatory (EE version)

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

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

Attempting to view an annotated tag in the TreeController would result
in `NoMethodError: undefined method 'tree'` when Rugged was in use.
`Blob#find_by_rugged` assumes that the ref is a true. Using
the commit ID ensures that the right ref is being used.

Closes gitlab-org/gitlab-ce!47797

Making the `gettext:updated_check` by completely regenerating the gitlab.pot.

This avoids an issue where `gettext:find` would not pick up on changes
if the file isn't removed first.

Add basic export to fix timeout problem on import_file_spec.rb

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

# Conflicts:
#	app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
#	app/assets/stylesheets/framework/mixins.scss
#	app/controllers/projects_controller.rb
#	db/schema.rb
#	spec/lib/gitlab/import_export/all_models.yml

[ci skip]

CE upstream - 2018-07-06 18:22 UTC

Closes gitlab-qa#146

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

Redesign for mr widget info and pipelines section

Closes #46795

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