Douwe MaanandTomasz Maczukin a834be61eb Merge branch 'todos-filter-project-delete' into 'master' ...

Ensure we don't show TODOS for projects pending delete

Joins the todos on the projects table in order to run the default scope. Also includes a where clause because the default scope is being removed soon.

An alternative approach, more like the Issues page, would be to filter down the list by passing user.authorized_projects into the where clause.

Or we could just be more defensive in the view when iterating.

Todos page throws 500 error for users with todos in a project pending deletion.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17813

cc\ @stanhu

See merge request !4300

2016-06-14 22:14:16 +02:00

..

config

Enable the Rubocop DeprecatedClassMethods cop

2016-05-08 15:33:34 -06:00

controllers

Merge branch 'rs-remember-me-2fa' into 'master'

2016-06-02 13:41:03 +02:00

factories

Create a todo on failing MR build

2016-05-17 10:17:45 +01:00

features

Merge branch 'todos-filter-project-delete' into 'master'

2016-06-14 22:14:16 +02:00

finders

Make upcoming milestone work across projects

2016-05-16 10:25:24 +01:00

fixtures

Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename'

2016-05-21 12:33:55 -05:00

helpers

Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename'

2016-05-21 12:33:55 -05:00

initializers

Add tests for setting trusted_proxies

2016-05-04 15:49:39 -07:00

javascripts

Merge branch 'zj-gitignore-dropdown'

2016-05-25 13:04:26 +02:00

lib

Merge branch 'current-settings-use-request-store-during-request'

2016-06-02 13:30:00 +02:00

mailers

Merge branch 'current-settings-use-request-store-during-request'

2016-06-02 13:30:00 +02:00

models

Merge branch 'data_leak' into 'master'

2016-06-02 13:49:18 +02:00

requests

Merge branch 'zj-gitignore-dropdown'

2016-05-25 13:04:26 +02:00

routing

Merge branch 'health-check-route'

2016-05-12 16:39:03 -05:00

services

Merge branch 'container-registry-token-ttl' into 'master'

2016-06-02 13:39:56 +02:00

support

Merge branch 'rs-remember-me-2fa' into 'master'

2016-06-02 13:41:03 +02:00

tasks/gitlab

Merge branch 'fix-registry-backups' into 'master'

2016-05-25 11:53:12 +02:00

views

Move "I should see Crowd login form" feature to a view spec

2016-02-24 17:38:13 -05:00

workers

Fix creation of Ci::Commit object which can lead to pending, failed in some scenarios

2016-05-19 15:51:41 -05:00

factories_spec.rb

Add support for not Active Record based factories

2016-03-30 10:44:18 +02:00

rails_helper.rb

Started on the actual rspec 3 upgrade

2015-06-22 12:12:49 +02:00

spec_helper.rb

Update rspec-rails from 3.3.3 to 3.4.2.

2016-05-01 13:44:50 -06:00

teaspoon_env.rb

teaspoon install

2015-05-28 18:22:32 -04:00