brightpearl-cli 2.7.0 → 2.8.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/routes/git_update.rb +2 -2
- data/lib/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 5fa2dc02b38e839c3c1544027ad60872e07369f4
|
4
|
+
data.tar.gz: 150f2cc0b9622895d36cd8982f32ee628ee7e13b
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 2d21418f4619a11fa7b7329a623155666b404a886657b3b6ecd9d92c9f29fb7b39de7a8e96352aefee3706f6533d68d7bc814847cd845e7d31603059d9a36920
|
7
|
+
data.tar.gz: 3445cceb4f5730d6c0f081c2737dfb94ed5a5d7b8dc086517d5b0a739d05d144c9ef219601eb537f1fe80e4ef774b0f433170d66111211d4717caa60430eaceb
|
data/lib/routes/git_update.rb
CHANGED
@@ -41,10 +41,10 @@ module AppCommand
|
|
41
41
|
if current_branch != App::Git::MASTER
|
42
42
|
commands << "git checkout #{App::Git::MASTER}"
|
43
43
|
end
|
44
|
-
commands << "git pull origin #{App::Git::MASTER}
|
44
|
+
commands << "git pull origin #{App::Git::MASTER}"
|
45
45
|
if current_branch != App::Git::MASTER
|
46
46
|
commands << "git checkout #{current_branch}"
|
47
|
-
commands << "git pull origin #{current_branch}
|
47
|
+
commands << "git pull origin #{current_branch}"
|
48
48
|
commands << 'git merge master --no-edit'
|
49
49
|
end
|
50
50
|
results = App::Terminal::command(commands, repo_dir)
|
data/lib/version.rb
CHANGED
@@ -1 +1 @@
|
|
1
|
-
VERSION = '2.
|
1
|
+
VERSION = '2.8.0'
|