diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-08-18 16:43:26 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-08-18 16:43:26 -0500 |
| commit | 8b05e8c2d10f78467db8bec140950104eba49e92 (patch) | |
| tree | 3933fdeb2089a448c82aa6c75b3087bcbca665f9 /app/assets/javascripts/application.js | |
| parent | b5d0346a99401ec138ee411660b5c7ee28421f84 (diff) | |
| parent | d97c83096a70ed102f993d4c484aff9c786ca831 (diff) | |
| download | gitlab-ce-8b05e8c2d10f78467db8bec140950104eba49e92.tar.gz | |
Merge branch 'master' into diff-line-comment-vuejs
# Conflicts:
# db/schema.rb
Diffstat (limited to 'app/assets/javascripts/application.js')
| -rw-r--r-- | app/assets/javascripts/application.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 4b8e687f3d4..a122fa2d637 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -26,7 +26,7 @@ /*= require bootstrap/tooltip */ /*= require bootstrap/popover */ /*= require select2 */ -/*= require ace/ace */ +/*= require ace-rails-ap */ /*= require ace/ext-searchbox */ /*= require underscore */ /*= require dropzone */ |