diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-03 00:01:08 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-03 00:01:08 +0200 |
| commit | 40a956eb6825f2bbca06e9f24c1fb24dc71a1ecd (patch) | |
| tree | 0b390d11b67df0b1df4fc4376ff3c9c75ddd45af /app | |
| parent | cac7723451e575ce39a6930990178450a2a972f0 (diff) | |
| download | gitlab-ce-40a956eb6825f2bbca06e9f24c1fb24dc71a1ecd.tar.gz | |
Few more fixes after removing roles
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/event.rb | 3 | ||||
| -rw-r--r-- | app/models/merge_request.rb | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/app/models/event.rb b/app/models/event.rb index eb88a4ed33a..95075ffae71 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -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 diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 052e0850d96..68211acc0c2 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -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 |