Merge pull request #905 from Vizzuality/staging

Staging

Author: apercas

.bowerrc

@@ -0,0 +1,3 @@
+{
+  "directory": "vendor/assets/bower_components"
+}

.editorconfig

@@ -0,0 +1,21 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+
+[*]
+
+# Change these settings to your own preference
+indent_style = space
+indent_size = 2
+
+# We recommend you to keep these unchanged
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false

.gitignore

@@ -16,6 +16,7 @@
 /tmp
 /media/upload
 /public/uploads
+/public/media
 
 .DS_Store
 
@@ -24,6 +25,15 @@
 .rvmrc
 .env
 .idea/
+.grunt
+node_modules
+public/assets
+vendor/assets/bower_components
+jstest/SpecRunner.html
+
+# Ignore Vagrant
+.vagrant
+Vagrantfile
 
 # Ingore Sublime project files:
-*.sublime-*
+*.sublime-*

.jshintrc

@@ -0,0 +1,33 @@
+{
+  "bitwise": false,
+  "browser": true,
+  "jquery": true,
+  "camelcase": false,
+  "curly": true,
+  "eqeqeq": true,
+  "esnext": true,
+  "expr": true,
+  "immed": true,
+  "indent": 2,
+  "latedef": true,
+  "newcap": true,
+  "noarg": true,
+  "node": true,
+  "noempty": true,
+  "nonstandard": true,
+  "quotmark": "single",
+  "regexp": true,
+  "smarttabs": true,
+  "strict": true,
+  "trailing": true,
+  "undef": true,
+  "unused": true,
+  "expr": true,
+
+  "predef": [
+    "define",
+    "google",
+    "cdb",
+    "cartodb"
+	]
+}

Gemfile

@@ -13,20 +13,20 @@ gem 'carrierwave'
 gem 'fog'
 gem 'rmagick', :require => false
 gem 'unf'
+gem 'requirejs-rails'
 
 group :development, :test do
   gem 'rspec-rails', '~> 2.0'
   gem 'launchy' # this lets us call save_and_open_page to see what's on a page for debugging capybara tests
   gem 'capybara', '2.0.3'  # capybara-webkit works with this version
+  gem 'capybara-screenshot'
   gem 'show_me_the_cookies'
   gem 'factory_girl_rails'
   gem 'shoulda-matchers'
-  gem 'jasmine-rails'
-  gem 'guard'
-  gem 'guard-jasmine-rails'
   gem 'database_cleaner'
   gem 'debugger'
 end
+
 group :development do
   gem 'better_errors'
   gem 'binding_of_caller'
@@ -35,7 +35,6 @@ group :development do
 end
 
 group :production do
-  gem 'pg'
   gem 'rails_12factor'
 end