diff --git a/.rubocop.yml b/.rubocop.yml
index 5489c823a..f8390ceee 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -188,6 +188,9 @@ Rails/HasAndBelongsToMany:
   Description: 'Prefer has_many :through to has_and_belongs_to_many.'
   Enabled: false
 
+Rails/SkipsModelValidations:
+  Enabled: false
+
 Rails/TimeZone:
   Description: 'Checks the correct usage of time zone aware methods.'
   StyleGuide: 'https://github.com/bbatsov/rails-style-guide#time'
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 2d7541dea..bfc317855 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -80,22 +80,8 @@ Rails/OutputSafety:
     - 'app/views/api/v0/articles/show.json.jbuilder'
     - 'app/views/articles/feed.rss.builder'
 
-Rails/SkipsModelValidations:
-  Enabled: false
-
 Layout/AlignParameters:
   Description: 'Here we check if the parameters on a multi-line method call or definition are aligned.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-double-indent'
   Enabled: false
 
-Layout/ConditionPosition:
-  Description: >-
-    Checks for condition placed in a confusing position relative to
-    the keyword.
-  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#same-line-condition'
-  Enabled: false
-
-Layout/InitialIndentation:
-  Description: >-
-    Checks the indentation of the first non-blank non-comment line in a file.
-  Enabled: false
diff --git a/Gemfile b/Gemfile
index 9ed525052..912d33f63 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,8 +14,8 @@ end
 
 gem "actionpack-action_caching", "~> 1.2"
 gem "active_record_union", "~> 1.3"
-gem "acts_as_follower", github: "thepracticaldev/acts_as_follower", branch: "master"
 gem "acts-as-taggable-on", "~> 6.0"
+gem "acts_as_follower", github: "thepracticaldev/acts_as_follower", branch: "master"
 gem "addressable", "~> 2.5", ">= 2.5.2"
 gem "administrate", "~> 0.11"
 gem "ahoy_email", "~> 0.5"
@@ -28,8 +28,8 @@ gem "aws-sdk-lambda", "~> 1.16" # Just Lambda. For more, install aws-sdk gem
 gem "bootsnap", ">= 1.1.0", require: false
 gem "bourbon", "~> 5.1"
 gem "buffer", "~> 0.1"
-gem "carrierwave-bombshelter", "~> 0.2"
 gem "carrierwave", "~> 1.3"
+gem "carrierwave-bombshelter", "~> 0.2"
 gem "cloudinary", "~> 1.11"
 gem "counter_culture", "~> 2.1"
 gem "csv_shaper", "~> 1.3"
@@ -42,8 +42,8 @@ gem "dry-struct", "~> 0.6"
 gem "email_validator", "~> 2.0"
 gem "emoji_regex", "~> 1.0"
 gem "envied", "~> 0.9"
-gem "fastly-rails", "~> 0.8"
 gem "fastly", "~> 1.15"
+gem "fastly-rails", "~> 0.8"
 gem "feedjira", "~> 2.2"
 gem "figaro", "~> 1.1"
 gem "fog", "~> 1.41"
@@ -51,7 +51,7 @@ gem "front_matter_parser", "~> 0.2"
 gem "gemoji", "~> 3.0.0"
 gem "gibbon", "~> 3.2"
 gem "google-api-client", "~> 0.27"
-gem 'honeycomb-beeline', "~> 0.7.0"
+gem "honeycomb-beeline", "~> 0.7.0"
 gem "html_truncator", "~> 0.4"
 gem "httparty", "~> 0.16"
 gem "inline_svg", "~> 1.3"
@@ -61,21 +61,21 @@ gem "kaminari", "~> 1.1"
 gem "liquid", "~> 4.0"
 gem "nokogiri", "~> 1.10"
 gem "octokit", "~> 4.13"
+gem "omniauth", "~> 1.9"
 gem "omniauth-github", "~> 1.3"
 gem "omniauth-twitter", "~> 1.4"
-gem "omniauth", "~> 1.9"
 gem "pg", "~> 1.1"
-gem "pry-rails", "~> 0.3"
 gem "pry", "~> 0.12"
+gem "pry-rails", "~> 0.3"
 gem "puma", "~> 3.12"
 gem "pundit", "~> 2.0"
-gem "pusher-push-notifications", "~> 1.0"
 gem "pusher", "~> 1.3"
+gem "pusher-push-notifications", "~> 1.0"
 gem "rack-host-redirect", "~> 1.3"
 gem "rack-timeout", "~> 0.5"
+gem "rails", "~> 5.2", ">= 5.2.3"
 gem "rails-assets-airbrake-js-client", "~> 1.5", source: "https://rails-assets.org"
 gem "rails-observers", "~> 0.1"
-gem "rails", "~> 5.2", ">= 5.2.3"
 gem "recaptcha", "~> 4.13", require: "recaptcha/rails"
 gem "redcarpet", "~> 3.4"
 gem "reverse_markdown", "~> 1.1"