flash_flow 1.4.12 → 1.4.13
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/release.rb +2 -2
- data/lib/flash_flow/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: b9668bebe0723a492e320111ab89f3d46f15ddb1
|
|
4
|
+
data.tar.gz: 14505cce79f449ed28992b66acfa45f63f25cd17
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: fb2404b4d297947afcda81d1e8da2fb7fc3ec01698cca67bdeef94409c5e570a68ce98979df5b59915c23060d067c646e77d90ee574b689c10ea13781890347a
|
|
7
|
+
data.tar.gz: b93e838c8db3ded79fd694562eb8ea716e25559a3c311694088274021c8429131094c0f77d717087c8b6affa122a3f9faf5d08a55836ad4ab45b103c86c6c402
|
data/Gemfile.lock
CHANGED
|
@@ -29,7 +29,7 @@ module FlashFlow
|
|
|
29
29
|
release = pending_release
|
|
30
30
|
if release
|
|
31
31
|
raise PendingReleaseError.new("There is already a pending release: #{release}")
|
|
32
|
-
elsif release_ahead_of_master
|
|
32
|
+
elsif release_ahead_of_master?
|
|
33
33
|
raise PendingReleaseError.new("The release branch '#{@git.release_branch}' has commits that are not in master")
|
|
34
34
|
end
|
|
35
35
|
|
|
@@ -108,4 +108,4 @@ Flash Flow merged these branches:
|
|
|
108
108
|
|
|
109
109
|
end
|
|
110
110
|
end
|
|
111
|
-
end
|
|
111
|
+
end
|
data/lib/flash_flow/version.rb
CHANGED