Update cartodb-common

4 years ago · b014ea22be
parent 026655e4cd
commit b014ea22be
2 changed files with 3 additions and 3 deletions
--- a/2
+++ b/2
@ -55,7 +55,7 @@ end

 gem 'cartodb-common',
    git: 'https://github.com/cartodb/cartodb-common.git',
-    branch: 'feature/ch127672/funnel-messages-shared-token-merge-base-command'
+    branch: 'feature/ch127672/funnel-messages-shared-token'
 gem 'roo',                     '1.13.2'
 gem 'state_machines-activerecord', '~> 0.5.0'
 gem 'typhoeus',                '1.3.1'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -8,8 +8,8 @@ GIT

 GIT
  remote: https://github.com/cartodb/cartodb-common.git
-  revision: 59a0855b9c990d8baa6ab76fcf0c8e0a4cb093fe
-  branch: feature/ch127672/funnel-messages-shared-token-merge-base-command
+  revision: db4221b184774a3a084a9c93630b91915d8473f0
+  branch: feature/ch127672/funnel-messages-shared-token
  specs:
    cartodb-common (0.5.3)
      argon2 (~> 2)