gitscape 1.3.7 → 1.3.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/lib/gitscape/base.rb CHANGED
@@ -200,11 +200,11 @@ class Gitscape::Base
200
200
 
201
201
  # Checkout release branch
202
202
  puts `git checkout #{release_branch_name}`
203
- puts `git pull #{release_branch_name}`
203
+ puts `git pull origin #{release_branch_name}`
204
204
 
205
205
  # Checkout live
206
206
  puts `git checkout live`
207
- puts `git pull live`
207
+ puts `git pull origin live`
208
208
 
209
209
  # Record the revision of live used for the rollback tag
210
210
  live_rollback_revision = `git log -n1 --oneline`.scan(/(^[^ ]+) .*$/).flatten[0]
@@ -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 master`
239
+ puts `git pull origin 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.7'
2
+ VERSION = '1.3.8'
3
3
  end
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 1
7
7
  - 3
8
- - 7
9
- version: 1.3.7
8
+ - 8
9
+ version: 1.3.8
10
10
  platform: ruby
11
11
  authors:
12
12
  - Jon Botelho