Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
djonasson committed May 11, 2015
1 parent 798820c commit 0f3e244
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 8 deletions.
1 change: 0 additions & 1 deletion app/models/fooltip/container.rb
Expand Up @@ -2,7 +2,6 @@ module Fooltip
class Container < ::ActiveRecord::Base
mount_uploader :image, ImageUploader
translates :title, :description, fallbacks_for_empty_translations: true
attr_accessible :description, :title, :translations_attributes, :links_attributes, :image, :remove_image
has_many :links, dependent: :destroy
has_many :associations, dependent: :destroy
has_many :popups, through: :links
Expand Down
2 changes: 0 additions & 2 deletions app/models/fooltip/popup.rb
Expand Up @@ -2,8 +2,6 @@ module Fooltip
class Popup < ::ActiveRecord::Base
translates :title, :content, fallbacks_for_empty_translations: true
accepts_nested_attributes_for :translations
attr_accessible :content, :title, :identifier, :min_width, :min_height,
:max_width, :max_height, :translations_attributes
has_many :links, dependent: :destroy
has_many :containers, through: :links
validates :identifier, presence: true
Expand Down
3 changes: 1 addition & 2 deletions fooltip.gemspec
Expand Up @@ -18,11 +18,10 @@ Gem::Specification.new do |s|
s.test_files = Dir["spec/**/*"]

s.add_dependency "rails", ">= 3.1.0"
s.add_dependency "globalize3", ">= 0.3.0"
s.add_dependency "globalize"
s.add_dependency "carrierwave", ">= 0.8.0"
s.add_dependency "mini_magick", ">= 3.4"
s.add_dependency "haml"
s.add_dependency "sass-rails", ">= 3.1"
s.add_dependency "jquery-rails", ">= 1.0.0"
s.add_dependency "bootstrap-sass", ">= 2.0", "< 3"
end
3 changes: 1 addition & 2 deletions lib/fooltip.rb
@@ -1,9 +1,8 @@
require "globalize3"
require "globalize"
require "carrierwave"
require "haml"
require "jquery-rails"
require "sass-rails"
require "bootstrap-sass"
require "fooltip/engine"
require "fooltip/active_record"

Expand Down
1 change: 0 additions & 1 deletion lib/fooltip/active_record.rb
Expand Up @@ -2,7 +2,6 @@ module Fooltip
module ActiveRecord

def has_fooltips
attr_accessible :fooltip_associations_attributes
has_many :fooltip_associations, as: :owner, class_name: "Fooltip::Association", dependent: :destroy
has_many :fooltips, through: :fooltip_associations, source: :container, class_name: "Fooltip::Container"
accepts_nested_attributes_for :fooltip_associations, reject_if: :all_blank, allow_destroy: true
Expand Down
Empty file removed spec/dummy/log/.gitkeep
Empty file.

0 comments on commit 0f3e244

Please sign in to comment.