diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-11-03 03:37:33 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-11-10 17:53:34 +0300 |
| commit | 99b421da2c5b2d889cd1e2ec6a5c60899bfe3593 (patch) | |
| tree | c8dc51c280ee82e5925ffd2bdf621d450dd00ab6 /app/assets/javascripts/merge_conflicts | |
| parent | a51285ade1d06f2383796cc2d9f36c33b46f79a4 (diff) | |
Migrate Vue v1 to v2.
Diffstat (limited to 'app/assets/javascripts/merge_conflicts')
| -rw-r--r-- | app/assets/javascripts/merge_conflicts/components/diff_file_editor.js.es6 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js.es6 b/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js.es6 index 6da3942ea52..9e4ffd07dbd 100644 --- a/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js.es6 +++ b/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js.es6 @@ -36,7 +36,7 @@ this.loadEditor(); } }, - ready() { + mounted() { if (this.file.loadEditor) { this.loadEditor(); } |