[Pkg-owncloud-commits] [owncloud] 174/205: Merge pull request #17222 from owncloud/issue-17101-send-oc-version-to-app-store

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit b56af26199aaaf5ca2a2969b0886e6b9b1ae622f
Merge: 70eb20e ae3d402
Author: Lukas Reschke <lukas at owncloud.com>
Date:   Mon Jun 29 15:07:00 2015 +0200

    Merge pull request #17222 from owncloud/issue-17101-send-oc-version-to-app-store
    
    Send OC version to appstore so it can reply with the right links

 lib/private/app.php                           | 10 +++---
 lib/private/installer.php                     |  6 ++--
 lib/private/ocsclient.php                     | 25 ++++++++++----
 settings/controller/appsettingscontroller.php |  2 +-
 tests/lib/ocsclienttest.php                   | 50 ++++++++++++++++-----------
 5 files changed, 58 insertions(+), 35 deletions(-)

diff --cc tests/lib/ocsclienttest.php
index 1e9e551,b8c4ed2..80102eb
--- a/tests/lib/ocsclienttest.php
+++ b/tests/lib/ocsclienttest.php
@@@ -771,9 -776,8 +777,9 @@@ class OCSClientTest extends \Test\TestC
  			'changed' => 1404743680,
  			'description' => 'Placeholder for future updates',
  			'score' => 50,
 +			'level' => 200,
  		];
- 		$this->assertSame($expected, $this->ocsClient->getApplication('MyId'));
+ 		$this->assertSame($expected, $this->ocsClient->getApplication('MyId', [8, 1, 0, 7]));
  	}
  	public function testGetApplicationEmptyXml() {
  		$this->config

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git