Merge branch 'development' into make-team-deletion-non-destructive

Author: begedin

app/models/team_membership.rb

@@ -8,7 +8,7 @@ class TeamMembership < ActiveRecord::Base
 
   before_destroy :prevent_owner_membership_deletion
 
-  enum role: [:invitee, :member, :admin, :owner]
+  enum role: { invitee: 0, member: 1, admin: 2, owner: 3 }
 
   def limit_role_to_invitee_for_unregistered_users
     if user.blank? and not invitee?

db/migrate/20150514124031_switch_team_membership_role_to_simple_integer.rb

@@ -1,6 +1,6 @@
 class SwitchTeamMembershipRoleToSimpleInteger < ActiveRecord::Migration
   def change
-    add_column :team_memberships, :role, :integer
+    add_column :team_memberships, :role, :integer, nullable: false, default: 0
 
     reversible do |dir|
       TeamMembership.all.each do |team_membership|