diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2018-08-03 14:17:22 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2018-08-03 14:17:22 +0900 |
| commit | 1f53cf7cf0cb53b5d69ab141fa9020356e62027e (patch) | |
| tree | fac87bd3fcf2900116bbc2777eb6f347f50922f6 /app/models/merge_request.rb | |
| parent | d867081df185b873667d9eec1184ac92efc8973e (diff) | |
| parent | 5f664759b57ef1c0fcfb7e95dfbff6c080a7a72f (diff) | |
| download | gitlab-ce-1f53cf7cf0cb53b5d69ab141fa9020356e62027e.tar.gz | |
Merge branch 'master-ce' into artifact-format-v2-with-parser
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index a99b197af66..9f8ebd9b4ca 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class MergeRequest < ActiveRecord::Base include AtomicInternalId include IidRoutes |