Merge branch 'master' of github.com:gitlabhq/gitlabhq

1eec1f4f · Dmitriy Zaporozhets · a7ab029d · 76c4421b · 1eec1f4f · 1eec1f4f
Commit 1eec1f4f authored Apr 03, 2014 by Dmitriy Zaporozhets
Showing with 4 additions and 4 deletions

app/assets/javascripts/commit/file.js.coffee app/assets/javascripts/commit/file.js.coffee +3 -3

app/assets/javascripts/commit/image-file.js.coffee app/assets/javascripts/commit/image-file.js.coffee +1 -1

No files found.
--- a/app/assets/javascripts/commit/file.js.coffee
+++ b/app/assets/javascripts/commit/file.js.coffee
@@ -4,4 +4,4 @@ class CommitFile
    if $('.image', file).length
      new ImageFile(file)

-this.CommitFile = CommitFile
\ No newline at end of file
+@CommitFile = CommitFile
--- a/app/assets/javascripts/commit/image-file.js.coffee
+++ b/app/assets/javascripts/commit/image-file.js.coffee
@@ -125,4 +125,4 @@ class ImageFile
      img.on 'load', =>
        callback.call(this, domImg.naturalWidth, domImg.naturalHeight)

-this.ImageFile = ImageFile
\ No newline at end of file
+@ImageFile = ImageFile