Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/assets/javascripts/application.js4
-rw-r--r--app/assets/stylesheets/application.css1
-rw-r--r--vendor/assets/javascripts/chosen.js (renamed from app/assets/javascripts/chosen.jquery.js)0
-rwxr-xr-xvendor/assets/javascripts/modernizr.js (renamed from app/assets/javascripts/modernizr-2.0.6.min.js)0
-rw-r--r--vendor/assets/stylesheets/chosen.css (renamed from app/assets/stylesheets/chosen.css)0
5 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 1b96c142eb6..93dbd7dd19c 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -10,6 +10,8 @@
//= require jquery.ui.selectmenu
//= require jquery.tagify
//= require jquery.cookie
+//= require modernizr
+//= require chosen
//= require raphael
//= require branch-graph
//= require_tree .
@@ -24,7 +26,7 @@ $(function(){
$(".account-box").mouseenter(showMenu);
$(".account-box").mouseleave(resetMenu);
-
+
});
function updatePage(data){
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 3884575d40e..4387066e02c 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -5,6 +5,7 @@
*= require jquery-ui/jquery-ui
*= require jquery-ui/jquery.ui.selectmenu
*= require jquery-ui/jquery.tagify
+ *= require chosen
*= require_self
*= require_tree .
*/
diff --git a/app/assets/javascripts/chosen.jquery.js b/vendor/assets/javascripts/chosen.js
index 34918fe9ae3..34918fe9ae3 100644
--- a/app/assets/javascripts/chosen.jquery.js
+++ b/vendor/assets/javascripts/chosen.js
diff --git a/app/assets/javascripts/modernizr-2.0.6.min.js b/vendor/assets/javascripts/modernizr.js
index 4f00b719c61..4f00b719c61 100755
--- a/app/assets/javascripts/modernizr-2.0.6.min.js
+++ b/vendor/assets/javascripts/modernizr.js
diff --git a/app/assets/stylesheets/chosen.css b/vendor/assets/stylesheets/chosen.css
index 7870f053d4c..7870f053d4c 100644
--- a/app/assets/stylesheets/chosen.css
+++ b/vendor/assets/stylesheets/chosen.css