diff options
| author | Felipe Artur <felipefac@gmail.com> | 2016-06-22 10:47:48 -0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2016-06-22 10:47:48 -0300 |
| commit | 2674b548601b279ada46d4b218a9def6fd5b9f6d (patch) | |
| tree | ca1f09225e4d5b80c800af521735bf34f04e16d0 /app/assets/javascripts/merge_request.js.coffee | |
| parent | 8447c6b180297840d835a609d95808834f498d87 (diff) | |
| parent | 6f6c6f68ea7cb976b6c1598e705ba8b2bdaf05a1 (diff) | |
| download | gitlab-ce-2674b548601b279ada46d4b218a9def6fd5b9f6d.tar.gz | |
merge master into issue_3359_3
Diffstat (limited to 'app/assets/javascripts/merge_request.js.coffee')
| -rw-r--r-- | app/assets/javascripts/merge_request.js.coffee | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_request.js.coffee b/app/assets/javascripts/merge_request.js.coffee index 1f46e331427..dabfd91cf14 100644 --- a/app/assets/javascripts/merge_request.js.coffee +++ b/app/assets/javascripts/merge_request.js.coffee @@ -9,7 +9,7 @@ class @MergeRequest # Options: # action - String, current controller action # - constructor: (@opts) -> + constructor: (@opts = {}) -> this.$el = $('.merge-request') this.$('.show-all-commits').on 'click', => |