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:
authorMike Greiling <mike@pixelcog.com>2019-03-13 17:02:19 +0300
committerClement Ho <clemmakesapps@gmail.com>2019-03-13 17:02:19 +0300
commit7f3719f328b791c1622a3c36c3d4d4a7f48e3256 (patch)
treecfde2e2485621a032aa0058d511ed62bae4d9dbf /app/assets/stylesheets/application.scss
parent3c40c57383cdcc9e35b93d1f8142f531557ee414 (diff)
Prefer node_modules At.js and jquery.carat versions
Remove references to the vendored copies of At.js and jquery.carat as well as the legacy rails wrapper gem.
Diffstat (limited to 'app/assets/stylesheets/application.scss')
-rw-r--r--app/assets/stylesheets/application.scss2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index d1cf2b8f9a0..86189143525 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -2,7 +2,6 @@
* This is a manifest file that'll automatically include all the stylesheets available in this directory
* and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
* the top of the compiled file, but it's generally better to create a new file per style scope.
- *= require jquery.atwho
*= require_self
*= require cropper.css
*/
@@ -15,6 +14,7 @@
* directory.
*/
+@import "../../../node_modules/at.js/dist/css/jquery.atwho";
@import "../../../node_modules/pikaday/scss/pikaday";
@import "../../../node_modules/dropzone/dist/basic";
@import "../../../node_modules/select2/select2";