Merge branch 'devel' into feat_protected_branches

Author: root

Diff for: app/models/git_cache.rb

@@ -1,5 +1,5 @@
 class GitCache < ActiveRecord::Base
   unloadable
 
-  attr_accessible :command, :command_output, :repo_identifier
+  attr_accessible :repo_identifier, :command, :command_output
 end

Diff for: app/models/github_comment.rb

@@ -3,5 +3,6 @@ class GithubComment < ActiveRecord::Base
 
   belongs_to :journal
 
-  validates_uniqueness_of :github_id, :scope => :journal_id
+  validates :github_id,  :presence => true
+  validates :journal_id, :presence => true, :uniqueness => { :scope => :github_id }
 end

Diff for: app/models/github_issue.rb

@@ -3,5 +3,6 @@ class GithubIssue < ActiveRecord::Base
 
   belongs_to :issue
 
-  validates_uniqueness_of :github_id, :scope => :issue_id
+  validates :github_id, :presence => true
+  validates :issue_id,  :presence => true, :uniqueness => { :scope => :github_id }
 end

Diff for: app/models/repository_git_config_key.rb

@@ -1,6 +1,8 @@
 class RepositoryGitConfigKey < ActiveRecord::Base
   unloadable
 
+  attr_accessible :key, :value
+
   ## Relations
   belongs_to :repository
 

Diff for: app/models/repository_git_notification.rb

@@ -3,6 +3,8 @@ class RepositoryGitNotification < ActiveRecord::Base
 
   VALID_EMAIL_REGEX  = /\A[\w+\-.]+@[a-z\d\-]+(?:\.[a-z\d\-]+)*\.[a-z]+\z/i
 
+  attr_accessible :prefix, :sender_address, :include_list, :exclude_list
+
   ## Relations
   belongs_to :repository
 
@@ -49,5 +51,4 @@ def validate_mailing_list
     end
   end
 
-
 end