Skip to content

Commit

Permalink
Merge pull request #1304 from internetee/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
vohmar authored Sep 13, 2019
2 parents ff58f9b + 62c9e9d commit 7137e2c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ gem 'kaminari', '0.16.3' # pagination
gem 'coderay', '1.1.0' # xml console visualize
gem 'select2-rails', '3.5.9.3' # for autocomplete
gem 'cancancan'
gem 'devise', '~> 4.0'
gem 'devise', '~> 4.7'

gem 'grape'
gem 'jbuilder', '2.2.16' # json api
Expand Down
12 changes: 6 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ GEM
descendants_tracker (~> 0.0.4)
ice_nine (~> 0.11.0)
thread_safe (~> 0.3, >= 0.3.1)
bcrypt (3.1.12)
bcrypt (3.1.13)
bootstrap-sass (3.4.1)
autoprefixer-rails (>= 5.2.1)
sassc (>= 2.0.0)
Expand Down Expand Up @@ -169,10 +169,10 @@ GEM
database_cleaner (1.6.1)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
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)
diff-lcs (1.3)
Expand Down Expand Up @@ -321,7 +321,7 @@ GEM
activesupport (>= 4.2.0, < 5.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.4)
rails-html-sanitizer (1.2.0)
loofah (~> 2.2, >= 2.2.2)
rails-settings-cached (0.7.2)
rails (>= 4.2.0)
Expand All @@ -330,7 +330,7 @@ GEM
activesupport (= 4.2.11.1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.3.2)
rake (12.3.3)
ransack (1.5.1)
actionpack (>= 3.0)
activerecord (>= 3.0)
Expand Down Expand Up @@ -475,7 +475,7 @@ DEPENDENCIES
daemons-rails (= 1.2.1)
data_migrate!
database_cleaner
devise (~> 4.0)
devise (~> 4.7)
digidoc_client!
domain_name
e_invoice!
Expand Down

0 comments on commit 7137e2c

Please sign in to comment.