# Conflicts:
#	config/routes/user.rb
#	db/schema.rb

[ci skip]

Update templates and licenses

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

Update guides for 10.6

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

Remove duplicate method definitions

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

Fixed missing SVG paths in IDE

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

Improve database response time for listing user activity

Closes #40525

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

CE upstream - 2018-03-08 12:23 UTC

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

Revert "Cleanup after adding MR diff's commit_count"

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

Resolve "Add missing foreign key constraint in clusters_applications_ingress"

Closes #43802

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

[CE] Add Naming/FileName rule checking expected class/module per filename

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

[EE] Add Naming/FileName rule checking expected class/module per filename

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

Adding missing indexes migrations from taggings table

Closes #43927

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

Add index on section_name_id on ci_build_trace_sections table

Closes #44008

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

This reverts commit 0b7d1085.

Clarify that the Pick Into X.Y label is added after approval

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

Remove double caching of Repository#empty?

Closes #43882

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

CE upstream - 2018-03-08 00:26 UTC

Closes gitaly#1057

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

Fix link to Merge Request Coach

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

Resolve "Change Clear Runners cache UJS action to an API request"

Closes #43770

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

Add missing delete method in mattermost session

Closes #37367 and #40660

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

This was causing user deletions to time out.

Closes #44008

Resolved using the master version. Since I believe the conflicts just
originated from a backport.

API requests were timing out because `tag_id` was missing an index. These
migrations were imported by running https://github.com/mbleigh/acts-as-taggable-on#post-installation:

```
bundle exec rake acts_as_taggable_on_engine:install:migrations
```

It looks like the `acts-as-tagglable` gem added the indexes in v4.0.0, but
when we upgraded from v3.5.0 (back in 2016 via
f571aeb5) we did not add them.

On staging, there are about 10.7 million rows on the `taggings` table. It took about 30 seconds for each index to be created.

On production, there are about 17.4 million rows, so I suspect the time to be about a minute per index.

Closes #43927