diff --git a/Gemfile b/Gemfile index d80b3bd..87ea2d0 100644 --- a/Gemfile +++ b/Gemfile @@ -21,7 +21,7 @@ group :assets do end gem 'simply_stored' , github: 'bterkuile/simply_stored' -gem 'orm_adapter', github: 'bterkuile/orm_adapter' +#gem 'orm_adapter', github: 'bterkuile/orm_adapter' gem 'devise' gem 'devise_simply_stored', github: 'bterkuile/devise_simply_stored' gem 'slim-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 560cc0b..1f40b54 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,12 +5,6 @@ GIT devise_simply_stored (0.3.0) devise -GIT - remote: git://github.com/bterkuile/orm_adapter.git - revision: e0b5f652c8d1eda8c0f6636f3b3d17d598603450 - specs: - orm_adapter (0.4.0) - GIT remote: git://github.com/bterkuile/simply_stored.git revision: 95e045e1ed073090505596d74c6f1d3f39ef4729 @@ -158,6 +152,7 @@ GEM netrc (0.11.0) nokogiri (1.6.7.2) mini_portile2 (~> 2.0.0.rc2) + orm_adapter (0.5.0) paperclip (4.3.6) activemodel (>= 3.2.0) activesupport (>= 3.2.0) @@ -262,7 +257,7 @@ GEM rack (>= 1, < 3) thor (0.19.1) thread_safe (0.3.5) - tilt (2.0.4) + tilt (2.0.5) tinymce-rails (4.3.12) railties (>= 3.1.1) tzinfo (1.2.2) @@ -295,7 +290,6 @@ DEPENDENCIES foundation-rails (~> 5.5) jquery-rails launchy - orm_adapter! paperclip (>= 3.4, != 4.3.0) pickadate-rails poltergeist