flash_flow 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9e6ab87ca9801e4629eeb09aa913478f1f79888
-  data.tar.gz: 7a6b1a46d93592d3a3a30e4aa8b265adc964db7f
+  metadata.gz: 49d73fb6eb9880932364ebc295d6ad33ca786fa1
+  data.tar.gz: 4c573c7241c9df3e771f09bb04a7eeab3294f65d
 SHA512:
-  metadata.gz: 54e395f55d85b3bfcfb431c8695a95d5c7a22df811ba13af8ca073a88ab99de269790daa2d11c020a930131b50f2cc712d19149c0f4d3f639279de5805628829
-  data.tar.gz: 5e3af873561db5af9410b4615f2d7f34b6ebd37eb160fa88903c9fa82588ce24adbfcc1697a68ad1d70e058e053e66ac09209ed2691c4fae64e85ef3596e70e0
+  metadata.gz: 508ada836ac3ca4a1eda158034af4190dd841e448d251b6a75ed15fbc005f1cf849254e55c1d11bbf473378722830afac5725c41be982d1d33d4468310e6fb1b
+  data.tar.gz: df18ba6a3399e38fda31dd14d9a1f0a0f401a8f21eaa989d9acca7558cb043c6036303e80e7d423889819f73f03a2cd14c0355dea839268090393dc095e835bd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    flash_flow (1.2.0)
+    flash_flow (1.2.1)
       hipchat (~> 1.5)
       octokit (~> 4.1)
       pivotal-tracker (~> 0.5)

data/lib/flash_flow/shadow_repo.rb

@@ -16,6 +16,7 @@ module FlashFlow
       create_shadow_repo
 
       Dir.chdir(flash_flow_dir) do
+        @git.fetch(@git.merge_remote)
         @git.run("reset --hard HEAD") if opts[:reset]
 
         yield

data/lib/flash_flow/version.rb

@@ -1,3 +1,3 @@
 module FlashFlow
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flash_flow
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Flashfunders
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-08 00:00:00.000000000 Z
+date: 2015-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit