summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Sumaran <alfredo@gitlab.com>2016-11-03 16:13:35 -0500
committerAlfredo Sumaran <alfredo@gitlab.com>2016-11-03 16:13:35 -0500
commit055e2ac293d7c79450dcd398a36d7f2382989822 (patch)
tree8b1c3361f3fbc593b4c96e4e1587c46636c3acae
parentcc83039a7044cf2c51c9909a11fd6dd422f88b8c (diff)
downloadgitlab-ce-055e2ac293d7c79450dcd398a36d7f2382989822.tar.gz
Move jquery.timeago to vendor directory
-rw-r--r--spec/javascripts/merge_request_widget_spec.js2
-rw-r--r--vendor/assets/javascripts/jquery.timeago.js (renamed from app/assets/javascripts/lib/utils/jquery.timeago.js)0
2 files changed, 1 insertions, 1 deletions
diff --git a/spec/javascripts/merge_request_widget_spec.js b/spec/javascripts/merge_request_widget_spec.js
index 1e2072f370a..49dfeab61d8 100644
--- a/spec/javascripts/merge_request_widget_spec.js
+++ b/spec/javascripts/merge_request_widget_spec.js
@@ -1,6 +1,6 @@
/* eslint-disable */
/*= require merge_request_widget */
-/*= require lib/utils/jquery.timeago.js */
+/*= require jquery.timeago.js */
(function() {
describe('MergeRequestWidget', function() {
diff --git a/app/assets/javascripts/lib/utils/jquery.timeago.js b/vendor/assets/javascripts/jquery.timeago.js
index de76cdd2ea7..de76cdd2ea7 100644
--- a/app/assets/javascripts/lib/utils/jquery.timeago.js
+++ b/vendor/assets/javascripts/jquery.timeago.js