diff --git a/.rubocop.yml b/.rubocop.yml index 0caae6c68..a726ce2b2 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,14 +1,8 @@ inherit_from: .rubocop_basic.yml -Bundler/DuplicatedGem: - Enabled: true - Bundler/InsecureProtocolSource: Enabled: true -Bundler/OrderedGems: - Enabled: true - Gemspec/DuplicatedAssignment: Enabled: true diff --git a/.rubocop_basic.yml b/.rubocop_basic.yml index 3767e18ba..52e7324ce 100644 --- a/.rubocop_basic.yml +++ b/.rubocop_basic.yml @@ -11,6 +11,12 @@ AllCops: # to ignore them, so only the ones explicitly set in this file are enabled. DisabledByDefault: true +Bundler/DuplicatedGem: + Enabled: true + +Bundler/OrderedGems: + Enabled: true + Capybara/CurrentPathExpectation: Enabled: true diff --git a/Gemfile b/Gemfile index b3c510745..81a57dd66 100644 --- a/Gemfile +++ b/Gemfile @@ -7,6 +7,8 @@ gem "acts_as_votable", "~> 0.11.1" gem "ahoy_matey", "~> 1.6.0" gem "ancestry", "~> 3.0.2" gem "autoprefixer-rails", "~> 8.2.0" +gem "axlsx", "~> 3.0.0.pre" +gem "axlsx_rails", "~> 0.5.2" gem "browser", "~> 2.5.3" gem "cancancan", "~> 2.3.0" gem "ckeditor", "~> 4.2.3" @@ -40,6 +42,7 @@ gem "paperclip", "~> 5.2.1" gem "paranoia", "~> 2.4.1" gem "pg", "~> 0.21.0" gem "pg_search", "~> 2.0.1" +gem "recipient_interceptor", "~> 0.2.0" gem "redcarpet", "~> 3.4.0" gem "responders", "~> 2.4.0" gem "rinku", "~> 2.0.2", require: "rails_rinku" @@ -55,11 +58,8 @@ gem "turnout", "~> 2.4.0" gem "uglifier", "~> 4.1.2" gem "unicorn", "~> 5.4.1" gem "whenever", "~> 0.10.0", require: false -gem "recipient_interceptor", "~> 0.2.0" -gem "wkhtmltopdf-binary", "~> 0.12.4" gem "wicked_pdf", "~> 1.1.0" -gem "axlsx", "~> 3.0.0.pre" -gem "axlsx_rails", "~> 0.5.2" +gem "wkhtmltopdf-binary", "~> 0.12.4" source "https://rails-assets.org" do gem "rails-assets-leaflet"