diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-14 11:51:58 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-14 11:51:58 +0000 |
| commit | d9bc57d18ec3d4ad0b0d8b223a67e496bc81ac88 (patch) | |
| tree | 5941655adf79e2b04b578955a4aab9eb4cc1046a /lib | |
| parent | bbef0ae03bc105234495144d369b87b748fd9ca7 (diff) | |
| parent | 7435b879a62f636a82c7a004b91ea291019a0b1e (diff) | |
| download | gitlab-ce-d9bc57d18ec3d4ad0b0d8b223a67e496bc81ac88.tar.gz | |
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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/satellite/compare_action.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/satellite/compare_action.rb b/lib/gitlab/satellite/compare_action.rb index c923bb9c0f0..9c9e69e3515 100644 --- a/lib/gitlab/satellite/compare_action.rb +++ b/lib/gitlab/satellite/compare_action.rb @@ -1,5 +1,7 @@ module Gitlab module Satellite + class BranchesWithoutParent < StandardError; end + class CompareAction < Action def initialize(user, target_project, target_branch, source_project, source_branch) super user, target_project @@ -22,7 +24,7 @@ module Gitlab diffs end rescue Grit::Git::CommandFailed => ex - handle_exception(ex) + raise BranchesWithoutParent end # Retrieve an array of commits between the source and the target |