nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:diaspora/diaspora

Browse source
This commit is contained in:
ilya 2010-08-18 21:43:20 -07:00
commit b081bdcfdf
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Gemfile
View file

@ -1,9 +1,9 @@
source 'http://rubygems.org' source 'http://rubygems.org'
gem 'rails', '3.0.0.rc' #gem 'rails', '3.0.0.rc'
gem 'bundler', '1.0.0.rc.5' #gem 'bundler', '1.0.0.rc.5'
#gem 'rails', '3.0.0.beta4' gem 'rails', '3.0.0.beta4'
#gem 'bundler', '0.9.26' gem 'bundler', '0.9.26'
#Security #Security
gem 'devise', :git => 'http://github.com/BadMinus/devise.git' gem 'devise', :git => 'http://github.com/BadMinus/devise.git'

2
config/application.rb
View file

@ -15,7 +15,7 @@ module Diaspora
# -- all .rb files in that directory are automatically loaded. # -- all .rb files in that directory are automatically loaded.
# Add additional load paths for your own custom dirs # Add additional load paths for your own custom dirs
config.autoload_paths += %W(#{config.root}/lib) #config.autoload_paths += %W(#{config.root}/lib)
# Only load the plugins named here, in the order given (default is alphabetical). # Only load the plugins named here, in the order given (default is alphabetical).
# :all can be used as a placeholder for all plugins not explicitly named # :all can be used as a placeholder for all plugins not explicitly named