diff options
| author | Phil Hughes <me@iamphill.com> | 2017-05-03 17:04:47 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-05-03 17:04:47 +0100 |
| commit | f29e5d4d93123ea73e5f58be46020781af2ef7cb (patch) | |
| tree | d08a8f8e5a9cf30dd4f238c187673ffe30ac39b3 /lib/banzai/reference_parser/merge_request_parser.rb | |
| parent | 4134d700623404948f163349882caf4a6d940cf3 (diff) | |
| parent | 8f29bf96b9306fd95b9b98019e80173b47b3a6b8 (diff) | |
| download | gitlab-ce-f29e5d4d93123ea73e5f58be46020781af2ef7cb.tar.gz | |
Merge branch 'master' into deploy-keys-load-async
Diffstat (limited to 'lib/banzai/reference_parser/merge_request_parser.rb')
| -rw-r--r-- | lib/banzai/reference_parser/merge_request_parser.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/banzai/reference_parser/merge_request_parser.rb b/lib/banzai/reference_parser/merge_request_parser.rb index 84a28b33d7c..8b0662749fd 100644 --- a/lib/banzai/reference_parser/merge_request_parser.rb +++ b/lib/banzai/reference_parser/merge_request_parser.rb @@ -33,7 +33,8 @@ module Banzai { namespace: :owner }, { group: [:owners, :group_members] }, :invited_groups, - :project_members + :project_members, + :project_feature ] }), self.class.data_attribute |