summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-08-02 09:47:05 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-08-02 09:47:05 +0000
commitc955c3d5bf43b4043a8fad04daa498b9f529cf98 (patch)
treebbad872e65a9c3e853559e623159d129f5da529d
parentdb17b3c7cd06a3296983b2a496e61c23564a0977 (diff)
parentf67c7a4da6eb7e363f5433df74016f234999c467 (diff)
downloadgitlab-ce-c955c3d5bf43b4043a8fad04daa498b9f529cf98.tar.gz
Merge branch '35769-fix-ruby-2-4-compatibility' into 'master'
Fix Issue board when using Ruby 2.4 Closes #35769 See merge request !13220
-rw-r--r--app/controllers/projects/boards/issues_controller.rb3
-rw-r--r--changelogs/unreleased/35769-fix-ruby-2-4-compatibility.yml4
2 files changed, 6 insertions, 1 deletions
diff --git a/app/controllers/projects/boards/issues_controller.rb b/app/controllers/projects/boards/issues_controller.rb
index da9b789d617..653e7bc7e40 100644
--- a/app/controllers/projects/boards/issues_controller.rb
+++ b/app/controllers/projects/boards/issues_controller.rb
@@ -66,7 +66,8 @@ module Projects
end
def filter_params
- params.merge(board_id: params[:board_id], id: params[:list_id]).compact
+ params.merge(board_id: params[:board_id], id: params[:list_id])
+ .reject { |_, value| value.nil? }
end
def move_params
diff --git a/changelogs/unreleased/35769-fix-ruby-2-4-compatibility.yml b/changelogs/unreleased/35769-fix-ruby-2-4-compatibility.yml
new file mode 100644
index 00000000000..ac480993d85
--- /dev/null
+++ b/changelogs/unreleased/35769-fix-ruby-2-4-compatibility.yml
@@ -0,0 +1,4 @@
+---
+title: Fix Issue board when using Ruby 2.4
+merge_request: 13220
+author: