mirror of
https://github.com/discourse/discourse.git
synced 2024-11-22 12:42:16 +08:00
move seed fu to work with my branch of seed fu while https://github.com/mbleigh/seed-fu/pull/54 is being decided
This commit is contained in:
parent
ee6882edfb
commit
c495a0b996
4
Gemfile
4
Gemfile
|
@ -32,12 +32,13 @@ if rails4?
|
|||
end
|
||||
end
|
||||
|
||||
gem 'seed-fu' , github: 'SamSaffron/seed-fu'
|
||||
|
||||
if rails4?
|
||||
gem 'rails', :git => 'git://github.com/rails/rails.git', :branch => '4-0-stable'
|
||||
gem 'redis-rails', :git => 'git://github.com/SamSaffron/redis-store.git'
|
||||
gem 'rails-observers'
|
||||
gem 'actionpack-action_caching'
|
||||
gem 'seed-fu' , github: 'mbleigh/seed-fu'
|
||||
else
|
||||
# we had pain with the 3.2.13 upgrade so monkey patch the security fix
|
||||
# next time around we hope to upgrade
|
||||
|
@ -47,7 +48,6 @@ else
|
|||
# REVIEW EVERY RELEASE
|
||||
gem 'sprockets', git: 'https://github.com/SamSaffron/sprockets.git', branch: 'rails-compat'
|
||||
gem 'redis-rails'
|
||||
gem 'seed-fu'
|
||||
gem 'activerecord-postgres-hstore'
|
||||
gem 'active_attr'
|
||||
end
|
||||
|
|
13
Gemfile.lock
13
Gemfile.lock
|
@ -1,3 +1,11 @@
|
|||
GIT
|
||||
remote: git://github.com/SamSaffron/seed-fu.git
|
||||
revision: 502c8b8514df3bf028c9231cc3a6ea3cff4f37f0
|
||||
specs:
|
||||
seed-fu (2.2.0)
|
||||
activerecord (>= 3.1, < 4.1)
|
||||
activesupport (>= 3.1, < 4.1)
|
||||
|
||||
GIT
|
||||
remote: git://github.com/sporkrb/spork-rails.git
|
||||
revision: 3224f84d8c31fcb0894e9a43f6c3ac67e3aa0d71
|
||||
|
@ -387,9 +395,6 @@ GEM
|
|||
railties (~> 3.2.0)
|
||||
sass (>= 3.1.10)
|
||||
tilt (~> 1.3)
|
||||
seed-fu (2.2.0)
|
||||
activerecord (~> 3.1)
|
||||
activesupport (~> 3.1)
|
||||
shoulda (3.4.0)
|
||||
shoulda-context (~> 1.0, >= 1.0.1)
|
||||
shoulda-matchers (~> 1.0, >= 1.4.1)
|
||||
|
@ -530,7 +535,7 @@ DEPENDENCIES
|
|||
sanitize
|
||||
sass
|
||||
sass-rails
|
||||
seed-fu
|
||||
seed-fu!
|
||||
shoulda
|
||||
sidekiq
|
||||
sidekiq-failures
|
||||
|
|
|
@ -18,8 +18,8 @@ GIT
|
|||
redis-store (~> 1.1.0)
|
||||
|
||||
GIT
|
||||
remote: git://github.com/mbleigh/seed-fu.git
|
||||
revision: f89ea306472c500ec7911c7be111a4aad9c1bc78
|
||||
remote: git://github.com/SamSaffron/seed-fu.git
|
||||
revision: 502c8b8514df3bf028c9231cc3a6ea3cff4f37f0
|
||||
specs:
|
||||
seed-fu (2.2.0)
|
||||
activerecord (>= 3.1, < 4.1)
|
||||
|
|
Loading…
Reference in New Issue
Block a user