Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 3 deletions

diff --git a/lib/gitlab/merge_requests/mergeability/check_result.rb b/lib/gitlab/merge_requests/mergeability/check_result.rb
index a25156661af..fae4b721e1a 100644
--- a/lib/gitlab/merge_requests/mergeability/check_result.rb
+++ b/lib/gitlab/merge_requests/mergeability/check_result.rb
@@ -22,8 +22,8 @@ module Gitlab
 
         def self.from_hash(data)
           new(
-            status: data.fetch('status').to_sym,
-            payload: data.fetch('payload'))
+            status: data.fetch(:status).to_sym,
+            payload: data.fetch(:payload))
         end
 
         def initialize(status:, payload: {})
diff --git a/lib/gitlab/merge_requests/mergeability/redis_interface.rb b/lib/gitlab/merge_requests/mergeability/redis_interface.rb
index b0e739f91ff..f274ce1d413 100644
--- a/lib/gitlab/merge_requests/mergeability/redis_interface.rb
+++ b/lib/gitlab/merge_requests/mergeability/redis_interface.rb
@@ -14,7 +14,7 @@ module Gitlab
 
         def retrieve_check(merge_check:)
           Gitlab::Redis::Cache.with do |redis|
-            Gitlab::Json.parse(redis.get(merge_check.cache_key + ":#{VERSION}"))
+            Gitlab::Json.parse(redis.get(merge_check.cache_key + ":#{VERSION}"), symbolize_keys: true)
           end
         end
       end