Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
cbeer committed May 11, 2017
1 parent 14900e7 commit f707d2d
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Expand Up @@ -59,7 +59,7 @@ end
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

gem 'devise'
gem 'devise', github: 'plataformatec/devise'
gem 'omniauth'
gem 'omniauth-facebook'
gem 'omniauth-github'
Expand Down
24 changes: 16 additions & 8 deletions Gemfile.lock
Expand Up @@ -5,6 +5,17 @@ GIT
acts-as-taggable-on (4.0.0)
activerecord (>= 4.0)

GIT
remote: https://github.com/plataformatec/devise.git
revision: ee01bac8b0b828b3da0d79c46115ba65c433d6c8
specs:
devise (4.3.0)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0, < 5.2)
responders
warden (~> 1.2.3)

GEM
remote: https://rubygems.org/
remote: https://rails-assets.org/
Expand Down Expand Up @@ -52,8 +63,6 @@ GEM
autoprefixer-rails (7.0.1)
execjs
bcrypt (3.1.11)
bcrypt-ruby (3.1.5)
bcrypt (>= 3.1.3)
bindex (0.5.0)
bootstrap (4.0.0.alpha6)
autoprefixer-rails (>= 6.0.3)
Expand Down Expand Up @@ -90,10 +99,6 @@ GEM
thor (~> 0.19.4)
tins (~> 1.6)
deep_merge (1.1.1)
devise (1.5.4)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.0.3)
warden (~> 1.1)
diff-lcs (1.3)
docile (1.1.5)
errbase (0.0.3)
Expand Down Expand Up @@ -190,7 +195,7 @@ GEM
omniauth-twitter (1.4.0)
omniauth-oauth (~> 1.1)
rack
orm_adapter (0.0.7)
orm_adapter (0.5.0)
paper_trail (7.0.2)
activerecord (>= 4.0, < 5.2)
request_store (~> 1.1)
Expand Down Expand Up @@ -241,6 +246,9 @@ GEM
ffi (>= 0.5.0)
redcarpet (3.4.0)
request_store (1.3.2)
responders (2.4.0)
actionpack (>= 4.2.0, < 5.3)
railties (>= 4.2.0, < 5.3)
rolify (5.1.0)
rspec-core (3.6.0)
rspec-support (~> 3.6.0)
Expand Down Expand Up @@ -341,7 +349,7 @@ DEPENDENCIES
coffee-rails (~> 4.2)
config
coveralls
devise
devise!
factory_girl_rails
friendly_id
github-markup
Expand Down

0 comments on commit f707d2d

Please sign in to comment.