diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-12-17 12:33:52 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-12-17 12:33:52 +0000 |
| commit | 368198d8ccbca3d8bba39c2e6ff8ad559db6e2e7 (patch) | |
| tree | 7dd095ecc2152680255a00e1f7dd0916a0dfc528 | |
| parent | e8374cb6f493880042bf21d70c275bfdeed65fbe (diff) | |
| parent | 807139b6b9bbcc7948ced6cb0124ee2271df695a (diff) | |
| download | gitlab-ce-368198d8ccbca3d8bba39c2e6ff8ad559db6e2e7.tar.gz | |
Merge branch 'deprecated-actiondispatch-paramsparser' into 'master'
Remove deprecated ActionDispatch::ParamsParser
See merge request gitlab-org/gitlab-ce!23848
| -rw-r--r-- | changelogs/unreleased/deprecated-actiondispatch-paramsparser.yml | 5 | ||||
| -rw-r--r-- | spec/lib/gitlab/middleware/read_only_spec.rb | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changelogs/unreleased/deprecated-actiondispatch-paramsparser.yml b/changelogs/unreleased/deprecated-actiondispatch-paramsparser.yml new file mode 100644 index 00000000000..9cfb00a9544 --- /dev/null +++ b/changelogs/unreleased/deprecated-actiondispatch-paramsparser.yml @@ -0,0 +1,5 @@ +--- +title: Remove deprecated ActionDispatch::ParamsParser +merge_request: 23848 +author: Jasper Maes +type: other diff --git a/spec/lib/gitlab/middleware/read_only_spec.rb b/spec/lib/gitlab/middleware/read_only_spec.rb index ac3bc6b2dfe..bdb1f34d2f6 100644 --- a/spec/lib/gitlab/middleware/read_only_spec.rb +++ b/spec/lib/gitlab/middleware/read_only_spec.rb @@ -8,7 +8,6 @@ describe Gitlab::Middleware::ReadOnly do rack = Rack::Builder.new do use ActionDispatch::Session::CacheStore use ActionDispatch::Flash - use ActionDispatch::ParamsParser end rack.run(subject) |