diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-07-07 20:52:17 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-07-07 20:52:17 +0000 |
commit | 94e2a286846ee8b8b36ac29ccae7d51cb19578d5 (patch) | |
tree | 6c85174841a33bf75e4be48cbe8814b4c3e36b27 /app/models/merge_request.rb | |
parent | ac09bbdc18eed278cf7f1b6d24acc27a879ab00f (diff) | |
parent | 6d28ad844d154eb8f7b9b7b8683b42ce70101789 (diff) | |
download | gitlab-ce-94e2a286846ee8b8b36ac29ccae7d51cb19578d5.tar.gz |
Merge branch 'feature/user-datetime-search-api-mysql' into 'master'
Add creation time filters to user search API for admins
Closes #29507
See merge request !12682
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 6ea774470af..30caa3598d1 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -5,6 +5,7 @@ class MergeRequest < ActiveRecord::Base include Referable include Sortable include IgnorableColumn + include CreatedAtFilterable ignore_column :position |