gitscape 1.3.6 → 1.3.7

Sign up to get free protection for your applications and to get access to all the features.
data/lib/gitscape/base.rb CHANGED
@@ -200,7 +200,7 @@ class Gitscape::Base
200
200
 
201
201
  # Checkout release branch
202
202
  puts `git checkout #{release_branch_name}`
203
- puts `git pull live`
203
+ puts `git pull #{release_branch_name}`
204
204
 
205
205
  # Checkout live
206
206
  puts `git checkout live`
@@ -236,7 +236,7 @@ class Gitscape::Base
236
236
 
237
237
  # Merge the release branch into master
238
238
  puts `git checkout master`
239
- puts `git pull`
239
+ puts `git pull master`
240
240
  puts `git merge #{merge_options} #{release_branch_name}`
241
241
 
242
242
  # Error and conflict checking
@@ -1,3 +1,3 @@
1
1
  module Gitscape
2
- VERSION = '1.3.6'
2
+ VERSION = '1.3.7'
3
3
  end
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 1
7
7
  - 3
8
- - 6
9
- version: 1.3.6
8
+ - 7
9
+ version: 1.3.7
10
10
  platform: ruby
11
11
  authors:
12
12
  - Jon Botelho