diff options
| author | Dmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com> | 2012-09-27 09:56:02 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com> | 2012-09-27 09:56:02 +0300 |
| commit | 19c58becc00982b718f0e11b74129ef2ccce2454 (patch) | |
| tree | ee7eb18b8e59074bc56ea06fd30ae241beed4a2f /app/models/merge_request.rb | |
| parent | 0439387be00bfb862b4454000f805f11fb8cc389 (diff) | |
| parent | 2c8d3c33ff64ac6af5daf125a2f9ef917e55bcfc (diff) | |
| download | gitlab-ce-19c58becc00982b718f0e11b74129ef2ccce2454.tar.gz | |
Merge branch 'tsigo-routing_overhaul'
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index bb7b53face0..717fe296934 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -1,4 +1,4 @@ -require File.join(Rails.root, "app/models/commit") +require Rails.root.join("app/models/commit") class MergeRequest < ActiveRecord::Base include IssueCommonality |