Merge 9ce9dad into 13d8068

Vizzuality · Aug 31, 2017 · f7d79b3 · f7d79b3
2 parents 13d8068 + 9ce9dad
commit f7d79b3
Show file tree

Hide file tree

Showing 36 changed files with 2,155 additions and 213 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -0,0 +1 @@
+/vendor
diff --git a/.eslintrc.yml b/.eslintrc.yml
@@ -0,0 +1,11 @@
+---
+  extends:
+    - eslint-config-airbnb-es5
+  globals:
+    define: true
+    $: true
+  rules:
+    func-names: 0
+    space-before-function-paren: 0
+    indent: [2, 2, {"SwitchCase": 1}]
+
diff --git a/Gemfile b/Gemfile
@@ -17,7 +17,7 @@ gem 'sdoc', '~> 0.4.0', group: :doc
 
 gem 'requirejs-rails'
 
-gem 'slim-rails'
+gem 'slim-rails', '3.1.1'
 
 gem 'httparty'
 gem 'rabl'