[ci skip] Update gem versions for 3.2 and 3.1. Also change some words.
Merge pull request #12907 from JuanitoFatas/upgrading

[ci skip] Update gem versions for 3.2 and 3.1. Also change some words.
handled Infinite recurssion case
Using ActiveSupport::Concern instead of Ruby hooks