Add cartodb-common as a git submodule

This is a bit of a hack to improve development speed
feature/ch113932/move-c-r-ud-on-organizations-from-appserver-original
Rafa de la Torre 4 years ago
parent f60d42c094
commit 9757859c71

3
.gitmodules vendored

@ -7,3 +7,6 @@
[submodule "lib/sql"]
path = lib/sql
url = git://github.com/CartoDB/cartodb-postgresql.git
[submodule "vendor/cartodb-common"]
path = vendor/cartodb-common
url = https://github.com/CartoDB/cartodb-common.git

@ -53,7 +53,7 @@ group :assets do
gem "compass", "1.0.3"
end
gem 'cartodb-common', git: 'https://github.com/cartodb/cartodb-common.git', tag: 'v0.3.7'
gem 'argon2', '~> 2.0' # needed by cartodb-common Argon2EncryptionStrategy
gem 'roo', '1.13.2'
gem 'state_machines-activerecord', '~> 0.5.0'
gem 'typhoeus', '1.3.1'

@ -6,15 +6,6 @@ GIT
oauth-plugin (0.4.0.pre4)
oauth (>= 0.4.4)
GIT
remote: https://github.com/cartodb/cartodb-common.git
revision: f098950c5fee57686718fea112d198e6e5e3dfd9
tag: v0.3.7
specs:
cartodb-common (0.3.6)
activesupport (~> 4.2.11.3)
argon2 (~> 2.0)
GIT
remote: https://github.com/kuldeepaggarwal/fake_net_ldap.git
revision: d99f2fcf13b9737a150f869fe9b9fbc0d788aa3f
@ -528,12 +519,12 @@ DEPENDENCIES
activerecord-postgresql-adapter
addressable (~> 2.5)
analytics-ruby (~> 2.0.0)
argon2 (~> 2.0)
avro (~> 1.10.0)
aws-sdk-acmpca (~> 1)
aws-sdk-s3 (~> 1)
byebug
capybara (= 2.18.0)
cartodb-common!
charlock_holmes (= 0.7.6)
ci_reporter (= 1.8.4)
compass (= 1.0.3)

@ -0,0 +1 @@
../../vendor/cartodb-common/lib/carto/common

@ -0,0 +1 @@
Subproject commit 85f1132fef28eb4cecd22082a8451499ceb94904
Loading…
Cancel
Save