# Conflicts:
#   db/schema.rb

Resolve "Render SHA in merge request commit reference with mono spaced font"

Closes #44994

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

Update template name via sentence case (feature)

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

DRY group creation code in nested groups fixtures

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

Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into update-template-name-via-sentence-case

# Conflicts:
#	.gitlab/issue_templates/Feature proposal.md

Run the review-docs jobs for gitlab-org repos only

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

Update template name via sentence case (research)

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

Update template name via sentence case (security)

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

Update template name via sentence case (database changes)

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

For reasons unknown, the logs of a web hook were paginated in memory.
This would result in the "Edit" page of a web hook timing out once it
has more than a few thousand log entries.

This commit makes the following changes:

1. We use LIMIT/OFFSET to paginate the data, instead of doing this in
   memory.

2. We limit the logs to the last two days, just like the documentation
   says (instead of retrieving everything).

3. We change the indexes on "web_hook_logs" so the query to get the data
   can perform a backwards index scan, without the need for a Filter.

These changes combined ensure that Projects::HooksController#edit no
longer times out.

Add readme button to non-empty project page

Closes #46963

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

Temporarily remove MR diffs removal migration

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

We will re-add this with a more efficient bulk scheduling method.

Backport partial index to find repositories that have not been checked

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

Resolve "New issue from failed build no longer links to failed build"

Closes #36907

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

Copyedit Bamboo integration docs

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

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

Prune web hook logs older than one month

Closes #46120

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

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

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

This was introduced in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5984.

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

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

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

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