[ifmeorg#1737] Resolved merge conflicts after Rails 6 upgrade

Dockerfile

@@ -18,7 +18,7 @@ RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 RUN mkdir /app
 WORKDIR /app
 
-RUN gem install bundler -v 1.17.3
+RUN gem install bundler -v 2.1.4
 
 ENTRYPOINT ["./docker-entrypoint.sh"]
 CMD ["bash"]

Gemfile

@@ -5,7 +5,7 @@ ruby '~> 2.6.0'
 
 gem 'puma'
 gem 'rack-rewrite'
-gem 'rails', '~> 5.2.4'
+gem 'rails', '~> 6.0.3'
 
 gem 'activerecord-import'
 gem 'bcrypt', '3.1.13'
@@ -35,7 +35,7 @@ gem 'omniauth-google-oauth2', '~> 0.7.0'
 gem 'omniauth-rails_csrf_protection', '~> 0.1.2'
 gem 'premailer-rails'
 gem 'pusher', '1.3.2'
-gem 'rails-i18n', '~> 5.1.3'
+gem 'rails-i18n', '~> 6.0.0'
 
 gem 'friendly_id', '~> 5.2.5'
 gem 'sdoc', '1.0.0', group: :doc
@@ -71,7 +71,7 @@ group :development, :test do
   gem 'factory_bot_rails'
   gem 'rspec-collection_matchers', '~> 1.1.3'
   gem 'rspec-html-matchers', '~> 0.9.0'
-  gem 'rspec-rails', '~> 3.8.2'
+  gem 'rspec-rails', '~> 4.0.0'
 
   gem 'letter_opener'
   gem 'rspec_junit_formatter'