delta/gitlab/gitlab-ce.git, branch fix-todos-counters

Update CHANGELOG

2016-06-17T16:46:55+00:00

Ensure Todos counters doesn't count Todos for projects pending delete

2016-06-17T16:46:55+00:00

Merge branch 'fix-toggling-task-should-not-generate-todo' into 'master'

2016-06-17T16:44:08+00:00


Fix error when editing an issuable with a task list

Closes #18712

See merge request !4751

Merge branch 'secure-request-uris' into 'master'

2016-06-17T16:43:14+00:00


Filter out sensitive parameters of metrics data

See merge request !4748

Merge branch 'update-column-in-batches-where' into 'master'

2016-06-17T16:36:22+00:00


Allow customising of queries used for `update_column_in_batches`

This MR makes two changes to `add_column_with_default` and `update_column_in_batches`:

1. `add_column_with_default` no longer wraps the entire set of updates in a single transaction, preventing any locks from sticking around for the duration of the entire transaction
2. `update_column_in_batches` now takes a block which can be used to customise the queries. This uses Arel as messing with raw SQL strings is a total pain

In !4381 there's a need for updating existing rows/columns in a table in batches using a custom `WHERE` condition. Without the changes in this MR this would not be possible.

See merge request !4680

Merge branch 'upgrade-ruby-tests-to-23' into 'master'

2016-06-17T16:19:31+00:00


Upgrade Ruby 2.2 tests to 2.3

This changes the GitLab CI Tests that test compatibility with Ruby 2.2
to instead test compat with Ruby 2.3.

We’ve discussed skipping straight to 2.3.0 when next upgrading the
required Ruby version.

Since Rails 5 requires 2.2.2, and we have to upgrade anyway, may as
well do it now and not risk having to upgrade again come Rails 5.1 or
5.2.

Test failures on Ruby 2.3 do not fail the build.

Related: #12507, #12835 

See merge request !3807

Filter out sensitive parameters of metrics data

2016-06-17T16:14:25+00:00

Merge branch 'contrib-calendar-colors' into 'master'

2016-06-17T16:07:41+00:00


Fixed issue with user calendar colors

## What does this MR do?

Fixes an issue with the colors added onto the user contrib calendar. The calendar was change recently to remove a library which affected how the colors where generated.

## What are the relevant issue numbers?

Closes #18505 

## Screenshots (if relevant)

![Screen_Shot_2016-06-13_at_09.33.10](/uploads/f17451d2eb805e9d75d859cd1691e0bc/Screen_Shot_2016-06-13_at_09.33.10.png)

See merge request !4614

Merge branch 'make-spring-optional' into 'master'

2016-06-17T15:51:10+00:00


Make spring optional

Require to `ENABLE_SPRING=1` to use spring. This assumes that you use binstubs from `bin/` which is true in most cases.

cc @jacobvosmaer-gitlab 

See merge request !4752

Fix update_column_in_batches to update all rows

2016-06-17T15:50:38+00:00

This changes update_column_in_batches to ensure it always updates all
rows now. These changes also allow for an extra SELECT query to be
removed, nor does it use the row count for determining offsets and the
likes; instead it's only used to determine the batch size.