dev_flow 0.1.2 → 0.1.3
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/dev_flow/app.rb +3 -3
- data/lib/dev_flow/roadmap.rb +1 -1
- data/lib/dev_flow/version.rb +1 -1
- metadata +1 -1
data/lib/dev_flow/app.rb
CHANGED
@@ -227,14 +227,14 @@ module DevFlow
|
|
227
227
|
|
228
228
|
info "Set progress of #{task.display_name} to #{progress}"
|
229
229
|
`git commit -am 'update progress of task #{task.branch_name} to #{progress}'`
|
230
|
-
`git push #{@config[
|
230
|
+
`git push #{@config["git_remote"]} develop` if @config["git_remote"]
|
231
231
|
|
232
232
|
# if this is a complete update, do not switch back
|
233
233
|
unless (is_complete or current_branch == 'develop')
|
234
234
|
switch_to! current_branch
|
235
235
|
`git merge develop`
|
236
|
-
if @config[
|
237
|
-
`git push #{@config[
|
236
|
+
if @config["git_remote"]
|
237
|
+
`git push #{@config["git_remote"]} #{current_branch}`
|
238
238
|
ask_rebase true # force rebase from git remote
|
239
239
|
end
|
240
240
|
end
|
data/lib/dev_flow/roadmap.rb
CHANGED
@@ -52,7 +52,7 @@ module DevFlow
|
|
52
52
|
if @tasks.size == 0 and head_part.size > 0
|
53
53
|
hhash = YAML.load(head_part)
|
54
54
|
members = @config["members"] || {}
|
55
|
-
members.merge!(hhash["members"]) if hhash["members"]
|
55
|
+
members.merge!(hhash["members"]) if hhash["members"] and hhash["members"].is_a?(Hash)
|
56
56
|
@config = @config.merge hhash
|
57
57
|
@config["members"] = members
|
58
58
|
end
|
data/lib/dev_flow/version.rb
CHANGED