Skip to content

Commit

Permalink
Merge pull request #3 from memair/dependabot/bundler/devise-4.7.1
Browse files Browse the repository at this point in the history
Bump devise from 4.6.1 to 4.7.1
  • Loading branch information
gregology authored Nov 9, 2019
2 parents 3bca798 + 152931e commit bf9dbb8
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ gem 'data-confirm-modal', '~> 1.6.2'
gem 'jquery-rails', '~> 4.3'
gem 'jquery-ui-rails', '~> 6.0'

gem 'devise', '~> 4.5'
gem 'devise', '~> 4.7'
gem 'omniauth-memair', '~> 0.0.5'

gem 'memair', '~> 0.1.3'
Expand Down
30 changes: 15 additions & 15 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ GEM
activerecord (>= 4.0)
autoprefixer-rails (9.4.8)
execjs
bcrypt (3.1.12)
bcrypt (3.1.13)
bindex (0.5.0)
bootsnap (1.4.0)
msgpack (~> 1.0)
Expand Down Expand Up @@ -82,17 +82,17 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.1.4)
concurrent-ruby (1.1.5)
crass (1.0.5)
data-confirm-modal (1.6.2)
railties (>= 3.0)
devise (4.6.1)
devise (4.7.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0, < 6.0)
railties (>= 4.1.0)
responders
warden (~> 1.2.3)
erubi (1.8.0)
erubi (1.9.0)
execjs (2.7.0)
faraday (0.17.0)
multipart-post (>= 1.2, < 3)
Expand All @@ -107,7 +107,7 @@ GEM
httparty (0.17.1)
mime-types (~> 3.0)
multi_xml (>= 0.5.2)
i18n (1.5.3)
i18n (1.7.0)
concurrent-ruby (~> 1.0)
io-like (0.3.0)
jbuilder (2.8.0)
Expand Down Expand Up @@ -140,7 +140,7 @@ GEM
mimemagic (0.3.3)
mini_mime (1.0.1)
mini_portile2 (2.4.0)
minitest (5.11.3)
minitest (5.13.0)
msgpack (1.2.6)
multi_json (1.13.1)
multi_xml (0.6.0)
Expand Down Expand Up @@ -172,7 +172,7 @@ GEM
method_source (~> 0.9.0)
public_suffix (3.0.3)
puma (3.12.0)
rack (2.0.6)
rack (2.0.7)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.2)
Expand All @@ -191,22 +191,22 @@ GEM
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
railties (5.2.2)
actionpack (= 5.2.2)
activesupport (= 5.2.2)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rake (12.3.2)
rake (13.0.0)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
regexp_parser (1.3.0)
responders (2.4.1)
actionpack (>= 4.2.0, < 6.0)
railties (>= 4.2.0, < 6.0)
responders (3.0.0)
actionpack (>= 5.0)
railties (>= 5.0)
ruby_dep (1.5.0)
rubyzip (1.2.2)
sass (3.7.3)
Expand Down Expand Up @@ -279,7 +279,7 @@ DEPENDENCIES
chromedriver-helper
coffee-rails (~> 4.2)
data-confirm-modal (~> 1.6.2)
devise (~> 4.5)
devise (~> 4.7)
geokit-rails (~> 2.3.1)
jbuilder (~> 2.5)
jquery-rails (~> 4.3)
Expand Down

0 comments on commit bf9dbb8

Please sign in to comment.