Dmitriy Zaporozhets d9bc57d18e Merge branch 'branches_with_no_parent' into 'master' ...

Branches with no parent cannot be merged

Solves `undefined method 'reduce' for false:FalseClass`

Fixes #1415

See merge request !967

2014-07-14 11:51:58 +00:00

..

files

Use same 30 seconds satellite timeout for all actions

2014-06-11 23:37:21 +03:00

action.rb

Style changes from review with @randx

2013-07-17 22:48:03 -04:00

compare_action.rb

Branches without parent commit cannot be merged.

2014-07-14 11:06:14 +02:00

logger.rb

satellites logs

2013-01-29 12:12:24 +02:00

merge_action.rb

Dont show 'Remove source brnach' checkbox for fork

2014-07-04 09:22:46 +03:00

satellite.rb

Remove thread-unsafe Dir.chdir from Satellite#lock

2014-07-14 12:16:57 +02:00