Remove cartodb-common git submodule and use gem instead

This commit does the following:

- Remove cartodb-common git submodule
- Add cartodb-common gem dependency back
- Remove dangling symlinks to git submodule
- Revert change in 95aac4ac84 (uneeded require)
feature/ch113932/move-c-r-ud-on-organizations-from-appserver-original
Rafa de la Torre 4 years ago
parent a1ad9d6d15
commit b53afa6937

3
.gitmodules vendored

@ -7,6 +7,3 @@
[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 'argon2', '~> 2.0' # needed by cartodb-common Argon2EncryptionStrategy
gem 'cartodb-common', git: 'https://github.com/cartodb/cartodb-common.git', tag: 'v0.4.1'
gem 'roo', '1.13.2'
gem 'state_machines-activerecord', '~> 0.5.0'
gem 'typhoeus', '1.3.1'

@ -6,6 +6,16 @@ GIT
oauth-plugin (0.4.0.pre4)
oauth (>= 0.4.4)
GIT
remote: https://github.com/cartodb/cartodb-common.git
revision: ddb45e67585022e8ecf54928401911d251378a7c
tag: v0.4.1
specs:
cartodb-common (0.4.1)
activesupport
argon2 (~> 2)
google-cloud-pubsub (~> 1.2.0)
GIT
remote: https://github.com/kuldeepaggarwal/fake_net_ldap.git
revision: d99f2fcf13b9737a150f869fe9b9fbc0d788aa3f
@ -519,12 +529,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)

@ -5,7 +5,6 @@ require "action_mailer/railtie"
require "active_record/railtie"
require_relative '../lib/carto/configuration'
require_relative '../lib/carto/carto_gears_support'
require_relative '../lib/carto/common/logger'
# Forcefully require Coverband config because otherwise it raises an error in the rails console
require './config/coverband'

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

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

@ -1 +0,0 @@
Subproject commit 845080ff7f545f8bbdc908e16e564de237dc3094
Loading…
Cancel
Save