diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-08-25 10:33:53 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-08-25 10:33:53 +0000 |
| commit | 5087f36d2358e470988df800f3ecfbe556190946 (patch) | |
| tree | e75b624dfeffe4d2bf4e41729da558f255ebf868 /app/models/merge_request.rb | |
| parent | 3fd929fd7657319854dd7fe54cb45b7a43cd6a39 (diff) | |
| parent | 92deb451da16bdc1b9520fc06f593b7e373d81af (diff) | |
| download | gitlab-ce-5087f36d2358e470988df800f3ecfbe556190946.tar.gz | |
Merge branch 'annotate' into 'master'
Annotate
See merge request !1040
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 b5705ef151d..10bd76b1c35 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -17,6 +17,7 @@ # target_project_id :integer not null # iid :integer # description :text +# position :integer default(0) # require Rails.root.join("app/models/commit") |