Merge branch '2.3_branch'

This commit is contained in:
Dan Rice 2015-08-30 11:43:10 -04:00
commit dbd2aa71b3

View file

@ -341,6 +341,8 @@ class ProjectsController < ApplicationController
if default_context_name.present? if default_context_name.present?
default_context = current_user.contexts.where(:name => default_context_name).first_or_create default_context = current_user.contexts.where(:name => default_context_name).first_or_create
p['default_context_id'] = default_context.id p['default_context_id'] = default_context.id
else
p['default_context_id'] = nil
end end
end end