Skip to content

Commit

Permalink
Merge branch 'master' into dry-rb
Browse files Browse the repository at this point in the history
  • Loading branch information
acmetech committed Sep 15, 2020
2 parents 7c81f69 + 0f47b06 commit 924233b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ GEM
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
ast (2.4.1)
autoprefixer-rails (9.8.6.3)
autoprefixer-rails (9.8.6.4)
execjs
backport (1.1.2)
bcrypt (3.1.16)
Expand Down Expand Up @@ -389,7 +389,7 @@ GEM
parser (>= 2.7.1.4)
rubocop-performance (1.8.0)
rubocop (>= 0.87.0)
rubocop-rails (2.8.0)
rubocop-rails (2.8.1)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 0.87.0)
Expand Down Expand Up @@ -510,7 +510,7 @@ DEPENDENCIES
rspec-rails (~> 4.0.1)
rubocop (~> 0.91.0)
rubocop-performance (~> 1.8.0)
rubocop-rails (~> 2.8.0)
rubocop-rails (~> 2.8.1)
rubocop-rspec (~> 1.43.2)
scss_lint (~> 0.59.0)
shoulda-matchers (~> 4.4.1)
Expand Down
2 changes: 1 addition & 1 deletion socializer.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ Gem::Specification.new do |s|
s.add_development_dependency("rails_best_practices", "~> 1.20.0")
s.add_development_dependency("rubocop", "~> 0.91.0")
s.add_development_dependency("rubocop-performance", "~> 1.8.0")
s.add_development_dependency("rubocop-rails", "~> 2.8.0")
s.add_development_dependency("rubocop-rails", "~> 2.8.1")
s.add_development_dependency("rubocop-rspec", "~> 1.43.2")
s.add_development_dependency("scss_lint", "~> 0.59.0")
s.add_development_dependency("solargraph")
Expand Down

0 comments on commit 924233b

Please sign in to comment.