Skip to content

Commit

Permalink
uses released authlogic and almost released paper trail
Browse files Browse the repository at this point in the history
  • Loading branch information
warp committed Jan 19, 2015
1 parent 16f5921 commit e810639
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 26 deletions.
3 changes: 0 additions & 3 deletions Gemfile
Expand Up @@ -81,6 +81,3 @@ gem 'coffee-rails'
gem 'uglifier'
gem 'execjs'
gem 'therubyracer', :platform => :ruby unless ENV["CI"]

gem 'authlogic', github: 'drhenner/authlogic', branch: 'rails4.2'
gem 'paper_trail', github: 'airblade/paper_trail'
31 changes: 10 additions & 21 deletions Gemfile.lock
@@ -1,22 +1,3 @@
GIT
remote: git://github.com/airblade/paper_trail.git
revision: 122c2d68939dd4d2c5bb6b8adbec751ee3ec2b1e
specs:
paper_trail (4.0.0.beta2)
activerecord (>= 3.0, < 6.0)
activesupport (>= 3.0, < 6.0)

GIT
remote: git://github.com/drhenner/authlogic.git
revision: 419c3a085cf8f88c04e2d38da859e5ffcee69c12
branch: rails4.2
specs:
authlogic (3.4.3)
activerecord (>= 3.2)
activesupport (>= 3.2)
request_store (~> 1.0)
scrypt (~> 1.2)

GEM
remote: https://rubygems.org/
specs:
Expand Down Expand Up @@ -65,6 +46,11 @@ GEM
activerecord (>= 3.0)
addressable (2.3.6)
arel (6.0.0)
authlogic (3.4.4)
activerecord (>= 3.2)
activesupport (>= 3.2)
request_store (~> 1.0)
scrypt (~> 1.2)
builder (3.2.2)
byebug (3.5.1)
columnize (~> 0.8)
Expand Down Expand Up @@ -211,6 +197,9 @@ GEM
notiffany (0.0.3)
nenv (~> 0.1)
shellany (~> 0.0)
paper_trail (4.0.0.beta2)
activerecord (>= 3.0, < 6.0)
activesupport (>= 3.0, < 6.0)
paperclip (4.2.1)
activemodel (>= 3.0.0)
activesupport (>= 3.0.0)
Expand Down Expand Up @@ -400,7 +389,7 @@ DEPENDENCIES
acts_as_commentable
acts_as_fu
acts_as_list
authlogic!
authlogic (>= 3.4.4)
byebug
cancancan
capistrano
Expand Down Expand Up @@ -429,7 +418,7 @@ DEPENDENCIES
jquery-rails
jquery-ui-rails
nokogiri
paper_trail!
paper_trail (>= 4.0.0.beta2)
paperclip
pg
premailer
Expand Down
4 changes: 2 additions & 2 deletions fat_free_crm.gemspec
Expand Up @@ -26,8 +26,8 @@ Gem::Specification.new do |gem|
gem.add_dependency 'paperclip'
# Manually added paperclip gem dependency "cocaine" in order to fix load error: "no such file to load -- cocaine"
gem.add_dependency 'cocaine'
gem.add_dependency 'paper_trail'
gem.add_dependency 'authlogic'
gem.add_dependency 'paper_trail', '>= 4.0.0.beta2'
gem.add_dependency 'authlogic', '>= 3.4.4'
gem.add_dependency 'acts_as_commentable'
gem.add_dependency 'acts-as-taggable-on', '>= 3.4.3'
gem.add_dependency 'dynamic_form'
Expand Down

0 comments on commit e810639

Please sign in to comment.