diff --git a/Gemfile.lock b/Gemfile.lock index 33cdaa7..8c77b65 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,17 @@ +GIT + remote: git://github.com/JangoSteve/remotipart.git + revision: aadc29e996c35096ee971bdc6cbf7ab148077a3a + specs: + remotipart (1.2.1) + +GIT + remote: git://github.com/airblade/paper_trail.git + revision: 802b7d4ead71703860fcb9befc2c9b2ee05a8b9f + specs: + paper_trail (3.0.0) + activerecord (>= 3.0, < 5.0) + activesupport (>= 3.0, < 5.0) + GEM remote: https://rubygems.org/ specs: @@ -73,10 +87,12 @@ GEM formtastic-bootstrap (2.1.3) formtastic (~> 2.2) git (1.2.5) - globalize3 (0.3.0) - activemodel (>= 3.0.0) - activerecord (>= 3.0.0) - paper_trail (~> 2) + globalize (3.0.4) + activemodel (>= 3.0.0, < 4.0.0) + activerecord (>= 3.0.0, < 4.0.0) + globalize-versioning (0.1.0.alpha.1) + globalize (>= 3, < 5) + paper_trail (~> 3.0.0) haml (4.0.0) tilt hashie (2.0.5) @@ -90,6 +106,8 @@ GEM jquery-rails (2.2.1) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) + jquery-ui-rails (4.1.1) + railties (>= 3.1.0) json (1.7.7) jwt (0.1.8) multi_json (>= 1.5) @@ -126,9 +144,6 @@ GEM oauth2 (~> 0.8.0) omniauth (~> 1.0) orm_adapter (0.4.0) - paper_trail (2.7.0) - activerecord (~> 3.0) - railties (~> 3.0) paperclip (3.4.0) activemodel (>= 3.0.0) activerecord (>= 3.0.0) @@ -229,17 +244,20 @@ DEPENDENCIES formtastic (~> 2.2.1) formtastic-bootstrap (~> 2.1.3) git - globalize3 (~> 0.3.0) + globalize (~> 3.0.4) + globalize-versioning haml jquery-fileupload-rails jquery-rails + jquery-ui-rails (~> 4.1.1) mysql2 omniauth omniauth-facebook omniauth-ldap - paper_trail (>= 2.7.0) + paper_trail (>= 2.7.0)! paperclip (~> 3.4.0) rails (= 3.2.9) + remotipart! rmagick rolify rspec-rails