summaryrefslogtreecommitdiff
path: root/app/models/commit.rb
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2015-10-20 17:12:23 +0200
committerJacob Vosmaer <contact@jacobvosmaer.nl>2015-10-20 17:12:23 +0200
commite4008bc415c112db6b2200fb9c79431ad4ffbecc (patch)
treeecedd7a4db93e1cdcebfed0c9afa194fbee30078 /app/models/commit.rb
parenta321404fde85fba6b09cbf1a56914f3a2ae555e4 (diff)
parentbefff6827a2cf81f6565b99212652a70139aa2b6 (diff)
downloadgitlab-ce-git-archive-improvements-2.tar.gz
Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-archive-improvements-2git-archive-improvements-2
Diffstat (limited to 'app/models/commit.rb')
-rw-r--r--app/models/commit.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb
index d5c50013525..23b5e38336c 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -2,13 +2,13 @@ class Commit
extend ActiveModel::Naming
include ActiveModel::Conversion
- include Mentionable
include Participable
+ include Mentionable
include Referable
include StaticModel
attr_mentionable :safe_message
- participant :author, :committer, :notes, :mentioned_users
+ participant :author, :committer, :notes
attr_accessor :project