diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-03-15 18:14:11 -0600 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-05 17:44:14 +0100 |
| commit | 1571835248aa504e36c6cdc6ac1be4db9da48135 (patch) | |
| tree | 4f045a654bd35e9cf9a014a5c4fcb6ed3e62c903 /app/assets/javascripts/files_comment_button.js | |
| parent | 9c30b0e918ca035d8555de5e3393247f6d00ed16 (diff) | |
| download | gitlab-ce-1571835248aa504e36c6cdc6ac1be4db9da48135.tar.gz | |
Fix merge conflict issue
Diffstat (limited to 'app/assets/javascripts/files_comment_button.js')
| -rw-r--r-- | app/assets/javascripts/files_comment_button.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/files_comment_button.js b/app/assets/javascripts/files_comment_button.js index d1d24b411a4..7f91bdd38ab 100644 --- a/app/assets/javascripts/files_comment_button.js +++ b/app/assets/javascripts/files_comment_button.js @@ -5,7 +5,7 @@ let $commentButtonTemplate; var bind = function(fn, me) { return function() { return fn.apply(me, arguments); }; }; -this.FilesCommentButton = (function() { +window.FilesCommentButton = (function() { var COMMENT_BUTTON_CLASS, EMPTY_CELL_CLASS, LINE_COLUMN_CLASSES, LINE_CONTENT_CLASS, LINE_HOLDER_CLASS, LINE_NUMBER_CLASS, OLD_LINE_CLASS, TEXT_FILE_SELECTOR, UNFOLDABLE_LINE_CLASS; COMMENT_BUTTON_CLASS = '.add-diff-note'; |