summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSacred Seven <sacred.seven@yahoo.com>2014-10-27 02:10:09 +0330
committerSacred Seven <sacred.seven@yahoo.com>2014-10-27 02:10:09 +0330
commite0bee39005eb7b1b9f00c7e37df9c9e1f23ebe8d (patch)
tree584fc5afbfd2aadef20dbdb56d45358277c7732d
parentb8ca423c1345a3d13f49fda60228c9bbee8ced37 (diff)
downloadgitlab-ce-rtl-7.4.2.1.tar.gz
Precompiling JalaliDatePicker assetsrtl-7.4.2.1
-rw-r--r--app/assets/javascripts/application.js.coffee5
-rw-r--r--app/assets/stylesheets/application.scss2
-rw-r--r--app/views/admin/broadcast_messages/index.html.haml5
-rw-r--r--app/views/projects/milestones/_form.html.haml5
4 files changed, 7 insertions, 10 deletions
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index 6095821f7dd..eebc292acfb 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -41,6 +41,11 @@
#= require shortcuts_issueable
#= require shortcuts_network
#= require_tree .
+#
+#= require JalaliJSCalendar-1.4/jalali
+#= require JalaliJSCalendar-1.4/calendar
+#= require JalaliJSCalendar-1.4/calendar-setup
+#= require JalaliJSCalendar-1.4/lang/calendar-fa
window.slugify = (text) ->
text.replace(/[^-a-zA-Z0-9]+/g, '_').toLowerCase()
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 7cb350ee442..9f7a59bf4ac 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -9,6 +9,8 @@
*= require highlightjs.min
*= require_self
*= require dropzone/basic
+ *
+ *= require JalaliJSCalendar-1.4/calendar-blue
*/
@import "main/*";
diff --git a/app/views/admin/broadcast_messages/index.html.haml b/app/views/admin/broadcast_messages/index.html.haml
index 77495724e15..800229f749a 100644
--- a/app/views/admin/broadcast_messages/index.html.haml
+++ b/app/views/admin/broadcast_messages/index.html.haml
@@ -1,8 +1,3 @@
-= stylesheet_link_tag "JalaliJSCalendar-1.4/calendar-blue"
-= javascript_include_tag "JalaliJSCalendar-1.4/jalali"
-= javascript_include_tag "JalaliJSCalendar-1.4/calendar"
-= javascript_include_tag "JalaliJSCalendar-1.4/calendar-setup"
-= javascript_include_tag "JalaliJSCalendar-1.4/lang/calendar-fa"
%h3.page-title
Broadcast Messages
%p.light
diff --git a/app/views/projects/milestones/_form.html.haml b/app/views/projects/milestones/_form.html.haml
index 6ffde743367..886f28a6e72 100644
--- a/app/views/projects/milestones/_form.html.haml
+++ b/app/views/projects/milestones/_form.html.haml
@@ -1,8 +1,3 @@
-= stylesheet_link_tag "JalaliJSCalendar-1.4/calendar-blue"
-= javascript_include_tag "JalaliJSCalendar-1.4/jalali"
-= javascript_include_tag "JalaliJSCalendar-1.4/calendar"
-= javascript_include_tag "JalaliJSCalendar-1.4/calendar-setup"
-= javascript_include_tag "JalaliJSCalendar-1.4/lang/calendar-fa"
%h3.page-title= @milestone.new_record? ? "New Milestone" : "Edit Milestone ##{@milestone.iid}"
.back-link
= link_to project_milestones_path(@project) do