codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2025-04-30 16:04:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use the latest version of seed-fu

Browse source 
seed-fu#54 has been merged, so we don't have to use the custom fork anymore.
It also include some changes that are required for Rails 4.2+, at least for now.

See d6c1205584 (commitcomment-7502487)
This commit is contained in:
Godfrey Chan 2014-08-24 02:39:05 -07:00
parent a11a21ca09
commit 09b9cec009
2 changed files with 3 additions and 5 deletions

4
Gemfile
View file

@ -67,9 +67,7 @@ unless Bundler::Dependency::PLATFORM_MAP.include? :mri_21
end end
end end
# see: https://github.com/mbleigh/seed-fu/pull/54 gem 'seed-fu', '~> 2.3.3'
# taking forever to get changes upstream in seed-fu
gem 'seed-fu-discourse', require: 'seed-fu'
if rails_master? if rails_master?
gem 'rails', git: 'https://github.com/rails/rails.git' gem 'rails', git: 'https://github.com/rails/rails.git'

4
Gemfile.lock
View file

@ -331,7 +331,7 @@ GEM
sass (~> 3.2.0) sass (~> 3.2.0)
sprockets (~> 2.8, <= 2.11.0) sprockets (~> 2.8, <= 2.11.0)
sprockets-rails (~> 2.0.0) sprockets-rails (~> 2.0.0)
seed-fu-discourse (2.2.1) seed-fu (2.3.3)
activerecord (>= 3.1, < 4.2) activerecord (>= 3.1, < 4.2)
activesupport (>= 3.1, < 4.2) activesupport (>= 3.1, < 4.2)
shoulda (3.5.0) shoulda (3.5.0)
@ -480,7 +480,7 @@ DEPENDENCIES
sanitize sanitize
sass sass
sass-rails (~> 4.0.2) sass-rails (~> 4.0.2)
seed-fu-discourse seed-fu (~> 2.3.3)
shoulda shoulda
sidekiq sidekiq
simple-rss simple-rss