Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Charcoal-SE/metasmoke
Browse files Browse the repository at this point in the history
  • Loading branch information
ArtOfCode- committed Nov 6, 2019
2 parents 40cd2ef + 9181114 commit 9f8b98c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Expand Up @@ -16,7 +16,7 @@ gem 'devise', git: 'https://github.com/plataformatec/devise'
gem 'htmlentities', '~> 4.3', '>= 4.3.4'
gem 'httparty'
gem 'jwt'
gem 'loofah', '~> 2.2.1', '>= 2.2.3'
gem 'loofah', '~> 2.3.1'
gem 'mysql2'
gem 'octokit', '~> 4.0'
gem 'paperclip', '~> 6.0.0'
Expand Down
8 changes: 4 additions & 4 deletions Gemfile.lock
Expand Up @@ -162,7 +162,7 @@ GEM
connection_pool (2.2.2)
crack (0.4.3)
safe_yaml (~> 1.0.0)
crass (1.0.4)
crass (1.0.5)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
docile (1.3.2)
Expand Down Expand Up @@ -221,7 +221,7 @@ GEM
jwt (2.2.1)
launchy (2.4.3)
addressable (~> 2.3)
loofah (2.2.3)
loofah (2.3.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
Expand Down Expand Up @@ -253,7 +253,7 @@ GEM
net-ssh (>= 2.6.5, < 6.0.0)
net-ssh (5.2.0)
nio4r (2.5.2)
nokogiri (1.10.4)
nokogiri (1.10.5)
mini_portile2 (~> 2.4.0)
octokit (4.14.0)
sawyer (~> 0.8.0, >= 0.5.3)
Expand Down Expand Up @@ -455,7 +455,7 @@ DEPENDENCIES
jbuilder (~> 2.0)
jquery-rails
jwt
loofah (~> 2.2.1, >= 2.2.3)
loofah (~> 2.3.1)
meta_request
mysql2
octokit (~> 4.0)
Expand Down

0 comments on commit 9f8b98c

Please sign in to comment.