mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Move from git submodule to gem bundle
This commit is contained in:
parent
5da109d105
commit
4cbd3f050b
5 changed files with 14 additions and 4 deletions
3
.gitmodules
vendored
3
.gitmodules
vendored
|
@ -1,3 +0,0 @@
|
|||
[submodule "arel"]
|
||||
path = arel
|
||||
url = git://github.com/miloops/arel.git
|
10
activerecord/Gemfile
Normal file
10
activerecord/Gemfile
Normal file
|
@ -0,0 +1,10 @@
|
|||
Gem.sources.each { |uri| source uri }
|
||||
sibling = "#{File.dirname(__FILE__)}/.."
|
||||
|
||||
gem "activesupport", "3.0.pre", :vendored_at => "#{sibling}/activesupport"
|
||||
gem "activemodel", "3.0.pre", :vendored_at => "#{sibling}/activemodel"
|
||||
gem "arel", :git => "git://github.com/rails/arel.git", :branch => 'master'
|
||||
|
||||
only :test do
|
||||
gem "mocha"
|
||||
end
|
|
@ -9,6 +9,7 @@ Gem::Specification.new do |s|
|
|||
|
||||
s.add_dependency('activesupport', '= 3.0.pre')
|
||||
s.add_dependency('activemodel', '= 3.0.pre')
|
||||
s.add_dependency('arel', '~> 0.1.0')
|
||||
|
||||
s.require_path = 'lib'
|
||||
s.autorequire = 'active_record'
|
||||
|
|
|
@ -1,6 +1,9 @@
|
|||
$:.unshift(File.dirname(__FILE__) + '/../../lib')
|
||||
$:.unshift(File.dirname(__FILE__) + '/../../../activesupport/lib')
|
||||
|
||||
bundler = "#{File.dirname(__FILE__)}/../../vendor/gems/environment"
|
||||
require bundler if File.exist?("#{bundler}.rb")
|
||||
|
||||
require 'config'
|
||||
|
||||
require 'rubygems'
|
||||
|
|
1
arel
1
arel
|
@ -1 +0,0 @@
|
|||
Subproject commit 927d8b8cde930244a16215c57896c8e45f616d0f
|
Loading…
Reference in a new issue