gitcycle 0.2.29 → 0.2.30

data/gitcycle.gemspec

@@ -6,7 +6,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = "gitcycle"
-  s.version     = '0.2.29'
+  s.version     = '0.2.30'
   s.platform    = Gem::Platform::RUBY
   s.authors     = [ 'Winton Welsh' ]
   s.email       = [ 'mail@wintoni.us' ]

data/lib/gitcycle.rb

@@ -364,7 +364,6 @@ class Gitcycle
       elsif branch =~ /^qa_/
         puts "\nRetrieving branch information from gitcycle.\n".green
         qa_branch = get('qa_branch', :source => branch.gsub(/^qa_/, ''))
-        qa_branch_name = "qa_#{qa_branch['source']}_#{qa_branch['user']}"
 
         if pass_fail == 'pass'
           checkout_or_track(:name => qa_branch['source'], :remote => 'origin')
@@ -380,28 +379,10 @@ class Gitcycle
 
         if pass_fail == 'pass' && issues.empty?
           owner, repo = qa_branch['repo'].split(':')
-
-          qa_branch['branches'].each do |b|
-            repo = b['repo'].split(':')[1]
-
-            add_remote_and_fetch(
-              :owner => b['home'],
-              :repo => repo
-            )
-
-            output = run("git log #{qa_branch_name}..#{b['home']}/#{repo}")
-
-            unless output.strip.empty?
-              puts "\nUn-merged changes detected in '#{repo}/#{b['home']}':".red
-              puts "\n#{output}"
-              puts "\nTo merge the change: git merge #{repo}/#{b['home']}".yellow
-            end
-          end
-          
           merge_remote_branch(
             :owner => owner,
             :repo => repo,
-            :branch => qa_branch_name,
+            :branch => "qa_#{qa_branch['source']}_#{qa_branch['user']}",
             :type => :from_qa
           )
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitcycle
 version: !ruby/object:Gem::Version
-  version: 0.2.29
+  version: 0.2.30
   prerelease: 
 platform: ruby
 authors: