flash_flow 1.2.0 → 1.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +1 -1
  3. data/lib/flash_flow/shadow_repo.rb +1 -0
  4. data/lib/flash_flow/version.rb +1 -1
  5. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c9e6ab87ca9801e4629eeb09aa913478f1f79888
4
- data.tar.gz: 7a6b1a46d93592d3a3a30e4aa8b265adc964db7f
3
+ metadata.gz: 49d73fb6eb9880932364ebc295d6ad33ca786fa1
4
+ data.tar.gz: 4c573c7241c9df3e771f09bb04a7eeab3294f65d
5
5
  SHA512:
6
- metadata.gz: 54e395f55d85b3bfcfb431c8695a95d5c7a22df811ba13af8ca073a88ab99de269790daa2d11c020a930131b50f2cc712d19149c0f4d3f639279de5805628829
7
- data.tar.gz: 5e3af873561db5af9410b4615f2d7f34b6ebd37eb160fa88903c9fa82588ce24adbfcc1697a68ad1d70e058e053e66ac09209ed2691c4fae64e85ef3596e70e0
6
+ metadata.gz: 508ada836ac3ca4a1eda158034af4190dd841e448d251b6a75ed15fbc005f1cf849254e55c1d11bbf473378722830afac5725c41be982d1d33d4468310e6fb1b
7
+ data.tar.gz: df18ba6a3399e38fda31dd14d9a1f0a0f401a8f21eaa989d9acca7558cb043c6036303e80e7d423889819f73f03a2cd14c0355dea839268090393dc095e835bd
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- flash_flow (1.2.0)
4
+ flash_flow (1.2.1)
5
5
  hipchat (~> 1.5)
6
6
  octokit (~> 4.1)
7
7
  pivotal-tracker (~> 0.5)
data/lib/flash_flow/shadow_repo.rb CHANGED
@@ -16,6 +16,7 @@ module FlashFlow
16
16
  create_shadow_repo
17
17
 
18
18
  Dir.chdir(flash_flow_dir) do
19
+ @git.fetch(@git.merge_remote)
19
20
  @git.run("reset --hard HEAD") if opts[:reset]
20
21
 
21
22
  yield
data/lib/flash_flow/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module FlashFlow
2
- VERSION = "1.2.0"
2
+ VERSION = "1.2.1"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: flash_flow
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.0
4
+ version: 1.2.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Flashfunders
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-11-08 00:00:00.000000000 Z
11
+ date: 2015-11-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: octokit