Skip to content

G
gitlab-ce
Commit 0a4de96e authored by Rémy Coutable's avatar Rémy Coutable
Browse files
Options

Resolve conflict in app/finders/issuable_finder.rb 

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent c8899c55
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
app/finders/issuable_finder.rb
View file @ 0a4de96e
...@@ -45,15 +45,11 @@ class IssuableFinder ...@@ -45,15 +45,11 @@ class IssuableFinder
].freeze ].freeze
ARRAY_PARAMS = { label_name: [], iids: [], assignee_username: [] }.freeze ARRAY_PARAMS = { label_name: [], iids: [], assignee_username: [] }.freeze
<<<<<<< HEAD
EE_SCALAR_PARAMS = %i[ EE_SCALAR_PARAMS = %i[
weight weight
].freeze ].freeze
VALID_PARAMS = (SCALAR_PARAMS + [ARRAY_PARAMS] + EE_SCALAR_PARAMS).freeze VALID_PARAMS = (SCALAR_PARAMS + [ARRAY_PARAMS] + EE_SCALAR_PARAMS).freeze
=======
VALID_PARAMS = (SCALAR_PARAMS + [ARRAY_PARAMS]).freeze
>>>>>>> upstream/master
attr_accessor :current_user, :params attr_accessor :current_user, :params
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7