Skip to content

Instantly share code, notes, and snippets.

@beatak

beatak/foo.patch

Created March 21, 2018 19:50
Show Gist options
  • Save beatak/8c59165728ee3009d067f2a7a20b54ed to your computer and use it in GitHub Desktop.
Save beatak/8c59165728ee3009d067f2a7a20b54ed to your computer and use it in GitHub Desktop.
Download ZIP
Raw
foo.patch
diff --git a/Gemfile b/Gemfile
index c9eea6e44f..4530c4a45e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -112,7 +112,7 @@ gem "slack-notifier" # used to send notifications when a sitemap is being genera
# :staging rake task uses this, and this would run in
# production environment
-gem 'pgsync'
+gem 'pgsync', :git => 'https://github.com/ankane/pgsync.git', :branch => 'master'
# Bundle gems for the local environment. Make sure to
# put test-only gems in this group so their generators
diff --git a/Gemfile.lock b/Gemfile.lock
index 2420baec70..c5073e4236 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,6 +9,17 @@ GIT
faraday_middleware
faraday_middleware-parse_oj (~> 0.3)
+GIT
+ remote: https://github.com/ankane/pgsync.git
+ revision: f4098e4b91eb3f095e6de11d2a2e5a455e74f79d
+ branch: master
+ specs:
+ pgsync (0.4.0)
+ multiprocessing
+ parallel
+ pg
+ slop (>= 4.2.0)
+
GIT
remote: https://github.com/fetlife/rollout
revision: adfc5ff092576446f945d858668de07af3de8db2
@@ -18,45 +29,45 @@ GIT
GEM
remote: https://rubygems.org/
specs:
- actioncable (5.1.4)
- actionpack (= 5.1.4)
+ actioncable (5.1.5)
+ actionpack (= 5.1.5)
nio4r (~> 2.0)
websocket-driver (~> 0.6.1)
- actionmailer (5.1.4)
- actionpack (= 5.1.4)
- actionview (= 5.1.4)
- activejob (= 5.1.4)
+ actionmailer (5.1.5)
+ actionpack (= 5.1.5)
+ actionview (= 5.1.5)
+ activejob (= 5.1.5)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
- actionpack (5.1.4)
- actionview (= 5.1.4)
- activesupport (= 5.1.4)
+ actionpack (5.1.5)
+ actionview (= 5.1.5)
+ activesupport (= 5.1.5)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionpack-action_caching (1.2.0)
actionpack (>= 4.0.0, < 6)
- actionview (5.1.4)
- activesupport (= 5.1.4)
+ actionview (5.1.5)
+ activesupport (= 5.1.5)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
- activejob (5.1.4)
- activesupport (= 5.1.4)
+ activejob (5.1.5)
+ activesupport (= 5.1.5)
globalid (>= 0.3.6)
- activemodel (5.1.4)
- activesupport (= 5.1.4)
+ activemodel (5.1.5)
+ activesupport (= 5.1.5)
activemodel-serializers-xml (1.0.2)
activemodel (> 5.x)
activesupport (> 5.x)
builder (~> 3.1)
- activerecord (5.1.4)
- activemodel (= 5.1.4)
- activesupport (= 5.1.4)
+ activerecord (5.1.5)
+ activemodel (= 5.1.5)
+ activesupport (= 5.1.5)
arel (~> 8.0)
- activesupport (5.1.4)
+ activesupport (5.1.5)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
minitest (~> 5.1)
@@ -141,7 +152,7 @@ GEM
activemodel-serializers-xml (~> 1.0)
activesupport (~> 5.0)
request_store (~> 1.0)
- erubi (1.7.0)
+ erubi (1.7.1)
erubis (2.7.0)
eventmachine (1.2.5)
excon (0.45.4)
@@ -235,7 +246,7 @@ GEM
htmlentities (4.3.4)
http-cookie (1.0.3)
domain_name (~> 0.5)
- i18n (0.9.1)
+ i18n (0.9.5)
concurrent-ruby (~> 1.0)
iniparse (1.4.4)
io-like (0.3.0)
@@ -251,7 +262,7 @@ GEM
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
- loofah (2.1.1)
+ loofah (2.2.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lumberjack (1.0.12)
@@ -270,7 +281,7 @@ GEM
mini_portile2 (2.3.0)
mini_racer (0.1.14)
libv8 (~> 5.9)
- minitest (5.10.3)
+ minitest (5.11.3)
mock_redis (0.17.3)
moneta (0.8.1)
multi_json (1.12.2)
@@ -281,7 +292,7 @@ GEM
net-http-persistent (2.9.4)
netrc (0.11.0)
newrelic_rpm (4.8.0.341)
- nio4r (2.1.0)
+ nio4r (2.3.0)
nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
nokogiri-happymapper (0.6.0)
@@ -293,15 +304,10 @@ GEM
overcommit (0.41.0)
childprocess (~> 0.6, >= 0.6.3)
iniparse (~> 1.4)
- parallel (1.12.0)
+ parallel (1.12.1)
parser (2.4.0.2)
ast (~> 2.3)
- pg (0.18.1)
- pgsync (0.3.8)
- multiprocessing
- parallel
- pg
- slop (>= 4.2.0)
+ pg (1.0.0)
pivotal-tracker (0.5.13)
builder
crack
@@ -337,21 +343,21 @@ GEM
rack-proxy (0.6.2)
rack
rack-rewrite (1.5.1)
- rack-test (0.8.2)
+ rack-test (0.8.3)
rack (>= 1.0, < 3)
rack-timeout (0.4.2)
railroady (1.5.3)
- rails (5.1.4)
- actioncable (= 5.1.4)
- actionmailer (= 5.1.4)
- actionpack (= 5.1.4)
- actionview (= 5.1.4)
- activejob (= 5.1.4)
- activemodel (= 5.1.4)
- activerecord (= 5.1.4)
- activesupport (= 5.1.4)
+ rails (5.1.5)
+ actioncable (= 5.1.5)
+ actionmailer (= 5.1.5)
+ actionpack (= 5.1.5)
+ actionview (= 5.1.5)
+ activejob (= 5.1.5)
+ activemodel (= 5.1.5)
+ activerecord (= 5.1.5)
+ activesupport (= 5.1.5)
bundler (>= 1.3.0)
- railties (= 5.1.4)
+ railties (= 5.1.5)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.2)
actionpack (~> 5.x, >= 5.0.1)
@@ -367,9 +373,9 @@ GEM
rails_stdout_logging
rails_serve_static_assets (0.0.4)
rails_stdout_logging (0.0.3)
- railties (5.1.4)
- actionpack (= 5.1.4)
- activesupport (= 5.1.4)
+ railties (5.1.5)
+ actionpack (= 5.1.5)
+ activesupport (= 5.1.5)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
@@ -481,7 +487,7 @@ GEM
slim (2.0.3)
temple (~> 0.6.6)
tilt (>= 1.3.3, < 2.1)
- slop (4.6.1)
+ slop (4.6.2)
spring (2.0.2)
activesupport (>= 4.2)
spring-commands-rspec (1.0.4)
@@ -506,7 +512,7 @@ GEM
truncato (0.7.10)
htmlentities (~> 4.3.1)
nokogiri (~> 1.8.0, >= 1.7.0)
- tzinfo (1.2.4)
+ tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (3.0.4)
execjs (>= 0.3.0, < 3)
@@ -578,7 +584,7 @@ DEPENDENCIES
nokogiri (~> 1.8)
overcommit
pg
- pgsync
+ pgsync!
pivotal-tracker
platform-api
pry-byebug
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment