Merge pull request #409 from wilsoc5/wilsoc5-patch-1

Protected branch name must no longer be unique across all projects

Author: Nicolas

Diff for: app/models/repository_protected_branche.rb

@@ -14,7 +14,7 @@ class RepositoryProtectedBranche < ActiveRecord::Base
 
   ## Validations
   validates :repository_id, presence: true
-  validates :path,          presence: true, uniqueness: { scope: :permissions }
+  validates :path,          presence: true, uniqueness: { scope: [:permissions, :repository_id] }
   validates :permissions,   presence: true, inclusion: { in: VALID_PERMS }
   validates :user_list,     presence: true