Merge branch '2.3_branch'

This brings the master branch up to date with the 2.3 release branch
This commit is contained in:
Matt Rogers 2015-08-07 20:27:14 -04:00
commit f393afb69f
27 changed files with 111 additions and 84 deletions

View file

@ -655,9 +655,6 @@ class TodosController < ApplicationController
# Set defaults for new_action
@initial_tags = @tag_name
unless @not_done_todos.empty?
@context = current_user.contexts.find(@not_done_todos.first.context_id)
end
# Set count badge to number of items with this tag
@not_done_todos.empty? ? @count = 0 : @count = @not_done_todos.size