[Pkg-owncloud-commits] [owncloud] 19/90: Merge pull request #12624 from nazar-pc/stable7

[David Prévot]

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

taffit pushed a commit to branch master
in repository owncloud.

commit 60099b91c42c55c140d57d83c5cff63e30fd637b
Merge: 5fd1d54 913ad86
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Fri Dec 12 11:34:40 2014 +0100

    Merge pull request #12624 from nazar-pc/stable7
    
    Backport of #11524 into stable7

 apps/files/js/filelist.js           | 10 ++++++----
 apps/files/js/files.js              |  2 +-
 apps/files/tests/js/filelistSpec.js |  7 ++++---
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --cc apps/files/tests/js/filelistSpec.js
index 3a51fc2,d6e3a65..351e9b5
--- a/apps/files/tests/js/filelistSpec.js
+++ b/apps/files/tests/js/filelistSpec.js
@@@ -121,10 -118,9 +121,10 @@@ describe('OCA.Files.FileList tests', fu
  			name: 'somedir',
  			mimetype: 'httpd/unix-directory',
  			size: 250,
 -			etag: '456'
 +			etag: '456',
 +			permissions: OC.PERMISSION_ALL
  		}];
- 
+ 		pageSizeStub = sinon.stub(OCA.Files.FileList.prototype, 'pageSize').returns(20);
  		fileList = new OCA.Files.FileList($('#app-content-files'));
  	});
  	afterEach(function() {

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