summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-02-12 08:52:43 +0000
committerFilipa Lacerda <filipa@gitlab.com>2018-02-12 08:52:43 +0000
commit595bc74001949405c13ae9db4e2b7acd81a237e3 (patch)
treea33e600c8f06fb221179616225531dc1e5161ac8 /lib
parenta1503cae82907f38a63b39731c60915e9c990bf5 (diff)
parent4e72e4563c4425b39714f068e3f94f1a6f7ed26f (diff)
downloadgitlab-ce-595bc74001949405c13ae9db4e2b7acd81a237e3.tar.gz
Merge branch '42908-rename-scss-files-to-use-snake-case' into 'master'
Rename .scss files to use snake_case Closes #42908 See merge request gitlab-org/gitlab-ce!17022
Diffstat (limited to 'lib')
-rw-r--r--lib/tasks/gemojione.rake2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/tasks/gemojione.rake b/lib/tasks/gemojione.rake
index c2d3a6b6950..c6942d22926 100644
--- a/lib/tasks/gemojione.rake
+++ b/lib/tasks/gemojione.rake
@@ -115,7 +115,7 @@ namespace :gemojione do
end
end
- style_path = Rails.root.join(*%w(app assets stylesheets framework emoji-sprites.scss))
+ style_path = Rails.root.join(*%w(app assets stylesheets framework emoji_sprites.scss))
# Combine the resized assets into a packed sprite and re-generate the SCSS
SpriteFactory.cssurl = "image-url('$IMAGE')"