deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Few more fixes after removing roles

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-01-03 00:01:08 +02:00
parent cac7723451
commit 40a956eb68
5 changed files with 2 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/models/event.rb
View file

@ -15,9 +15,6 @@
#
class Event < ActiveRecord::Base
include NoteEvent
include PushEvent
attr_accessible :project, :action, :data, :author_id, :project_id,
:target_id, :target_type

2
app/models/merge_request.rb
View file

@ -20,7 +20,7 @@
#
require Rails.root.join("app/models/commit")
require Rails.root.join("app/roles/static_model")
require Rails.root.join("lib/static_model")
class MergeRequest < ActiveRecord::Base
include IssueCommonality