diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-07 09:58:51 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-07 09:58:51 +0000 |
| commit | 0fbd6244ec8d06376b4130a4832dd77ce207fc5f (patch) | |
| tree | 7b37277e5e5ce28c3cafaecf0a4887b8faf58348 /app/models/merge_request.rb | |
| parent | 14805d6f5c36f9901e96ddb6192cade7cbce67de (diff) | |
| parent | d7812a95cf518dfa1565a0514b87fb40f86949e5 (diff) | |
| download | gitlab-ce-0fbd6244ec8d06376b4130a4832dd77ce207fc5f.tar.gz | |
Merge branch 'annotate-models' into 'master'
Re-annotate models
See merge request !1253
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 467b90861f9..93faa133875 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -19,6 +19,7 @@ # description :text # position :integer default(0) # locked_at :datetime +# updated_by_id :integer # require Rails.root.join("app/models/commit") |