v2gpti 1.2.4 → 1.2.5
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.
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 1f5068fd394830c0822052d3b823ce91c54f5db2
|
|
4
|
+
data.tar.gz: c2fcbcce02c691131db437de0745619c40a4681c
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 123cd3ce2567605b60214538f5a48df0af7c24cc69ae993c303e1e036b34b333e2d0025980f959619d6e2be56fd439c942758fe9cd0ae9a5e73101e1fb9be377
|
|
7
|
+
data.tar.gz: d1e60b19b1ff641705589c4a44144af2b874ded9e7ceda0e132fbf723aec591e725997ebd674ae669e0a3129bfd77a5032291dba972219a2c678fd505edd2dbe
|
|
@@ -51,7 +51,7 @@ module GitPivotalTrackerIntegration
|
|
|
51
51
|
puts Util::Shell.exec "git checkout QA"
|
|
52
52
|
Util::Shell.exec "git reset --hard origin/QA"
|
|
53
53
|
puts Util::Shell.exec "git fetch"
|
|
54
|
-
Util::Shell.exec "git merge -s recursive --strategy-option theirs origin
|
|
54
|
+
Util::Shell.exec "git merge -s recursive --strategy-option theirs origin/QA"
|
|
55
55
|
|
|
56
56
|
|
|
57
57
|
# checkout master branch
|
metadata
CHANGED
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: v2gpti
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.2.
|
|
4
|
+
version: 1.2.5
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Jeff Wolski
|
|
8
8
|
- Ben Hale
|
|
9
|
-
-
|
|
9
|
+
- Manoj P M
|
|
10
10
|
autorequire:
|
|
11
11
|
bindir: bin
|
|
12
12
|
cert_chain: []
|
|
13
|
-
date: 2015-
|
|
13
|
+
date: 2015-08-05 00:00:00.000000000 Z
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|
|
16
16
|
name: highline
|