Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updating paperclip, stage uno #33

Merged
merged 1 commit into from
Feb 2, 2013
Merged

Updating paperclip, stage uno #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ gem '_bushido-faye', '0.8.2'
# Helper gems
gem 'kaminari'
gem 'aws-sdk'
gem 'cloudfuji_paperclip'
gem 'paperclip'
gem 'remotipart'
gem 'jquery-rails'

Expand Down
16 changes: 8 additions & 8 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,7 @@ GEM
json (>= 1.4.6)
orm_adapter (~> 0.0.3)
rest-client (>= 1.6.1)
cloudfuji_paperclip (3.0.3)
activemodel (>= 3.0.0)
activerecord (>= 3.0.0)
activesupport (>= 3.0.0)
cocaine (>= 0.0.2)
mime-types
cocaine (0.2.1)
cocaine (0.4.2)
coderay (1.0.8)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
Expand Down Expand Up @@ -157,6 +151,12 @@ GEM
multi_xml (0.4.2)
nokogiri (1.5.0)
orm_adapter (0.0.6)
paperclip (3.4.0)
activemodel (>= 3.0.0)
activerecord (>= 3.0.0)
activesupport (>= 3.0.0)
cocaine (~> 0.4.0)
mime-types
pg (0.12.2)
polyglot (0.3.3)
pry (0.9.10)
Expand Down Expand Up @@ -268,7 +268,6 @@ DEPENDENCIES
binding_of_caller
bourbon
cloudfuji
cloudfuji_paperclip
coffee-rails
database_cleaner
devise
Expand All @@ -282,6 +281,7 @@ DEPENDENCIES
jasmine (~> 1.3.1)
jquery-rails
kaminari
paperclip
pg
pry-rails
quiet_assets
Expand Down
2 changes: 0 additions & 2 deletions app/models/attachment.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
require 'cloudfuji_paperclip'

class Attachment < ActiveRecord::Base
belongs_to :channel
belongs_to :user
Expand Down