assets: move dist css to public

.gitignore

@@ -10,6 +10,7 @@ public/system
 public/uploads
 public/javascripts
 public/stylesheets
+app/assets/stylesheets/tmp/
 db/schema.rb
 *.pyc
 bin/

app/assets/stylesheets/common

@@ -1 +1 @@
-Subproject commit b1aaf52e1a3db6ddae2ce8a07603a76f6152ffcb
+Subproject commit 8e026ece88a5332c4d0f2e3a5d366a203fb39e42

lib/assets/javascripts/cdb

@@ -1 +1 @@
-Subproject commit 2317466758b8dff8d949b7f1492e0f9998da0079
+Subproject commit acb502603418cbea2336ea63435bc40cc4d302a5

lib/build/Gruntfile.js

@@ -41,7 +41,7 @@ module.exports = function(grunt) {
           }
         },
         files: {
-          'dist/templates_mustache.js': cartodb_files._templates_mustache,
+          '../../public/javascripts/templates_mustache.js': cartodb_files._templates_mustache,
         }
       }
     },
@@ -52,7 +52,7 @@ module.exports = function(grunt) {
           importPath: '../../app/assets/stylesheets/tmp/common',
           imagesDir: '../../app/assets/images/',
           sassDir: '../../app/assets/stylesheets/tmp',
-          cssDir: 'dist/css',
+          cssDir: '../../public/stylesheets',
           environment: 'production',
           outputStyle: 'compact',
           force: false,
@@ -89,7 +89,7 @@ module.exports = function(grunt) {
 
     jasmine: {
       pivotal: {
-          src: cartodb_files.all.concat(['user_data.js', 'dist/templates_mustache.js', 'dist/templates.js', 'test_init.js']),
+          src: cartodb_files.all.concat(['user_data.js', '../../public/javascripts/templates_mustache.js', '../../public/javascripts/templates.js', 'test_init.js']),
           options: {
             specs:  cartodb_files.specs,
             helpers: ['http://maps.google.com/maps/api/js?sensor=false&v=3.12'].concat(cartodb_files._spec_helpers)

lib/build/config.rb

@@ -22,3 +22,5 @@ line_comments = false
 # preferred_syntax = :sass
 # and then run:
 # sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass
+
+Encoding.default_external = "utf-8"