flash_flow 1.3.0 → 1.3.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/lib/flash_flow/merge_order.rb +2 -1
- data/lib/flash_flow/version.rb +1 -1
- data/test/lib/test_merge_order.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 2a90282f76b1ac98c205366c66d51e2466b8f725
|
|
4
|
+
data.tar.gz: f882884dda4d2baa6a9dd8b89262d3420bf7cef9
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 34b9d57af05dcec0cffdd1983df11660803e0d7abd0391942fc1e5ca8ee848e6ac0082319015e80fd0d31bc116e38cb1ef15e1457ae715ff5b0e0db8c8e4468e
|
|
7
|
+
data.tar.gz: f8ac58bdd94bbd0e0bac5566b086ae44cbdeeb53a2fe4cf7d224e86f88d6fbb3e55bcf8aa689978e8b5172b7d3504b715ac3d83b1e40ce2329664f2184e1832c
|
data/Gemfile.lock
CHANGED
|
@@ -7,7 +7,8 @@ module FlashFlow
|
|
|
7
7
|
end
|
|
8
8
|
|
|
9
9
|
def get_order
|
|
10
|
-
|
|
10
|
+
new_branches, old_branches = @branches.partition { |branch| branch.merge_order.nil? }
|
|
11
|
+
branches = old_branches.sort_by(&:merge_order) + new_branches
|
|
11
12
|
|
|
12
13
|
unchanged, changed = branches.partition { |branch| current_sha(branch) == branch.sha }
|
|
13
14
|
my_branch_index = changed.find_index { |branch| branch.ref == @git.working_branch }
|
data/lib/flash_flow/version.rb
CHANGED
|
@@ -63,7 +63,7 @@ module FlashFlow
|
|
|
63
63
|
|
|
64
64
|
def mergeable_order(*order)
|
|
65
65
|
order.map.with_index do |nth, merge_order|
|
|
66
|
-
sample_branches[nth].merge_order = merge_order
|
|
66
|
+
sample_branches[nth].merge_order = (merge_order == 2 ? nil : merge_order)
|
|
67
67
|
sample_branches[nth]
|
|
68
68
|
end
|
|
69
69
|
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.3.
|
|
4
|
+
version: 1.3.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Flashfunders
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2016-02-
|
|
11
|
+
date: 2016-02-24 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: octokit
|