Migrate to Ruby 2.1.2
Partial commit of the Rails 4 migration. #740
Partial commit 2 for the Rails 4 migration. #740
Partial commit 3 for the Rails 4 migration. Fixing a few tests #740
Partial commit 4 for the Rails 4 migration. Fixing a few tests #740
Partial commit 4 for the Rails 4 migration. Fixing a few tests and removing all the deprecation warnings #740
Partial commit 5 for the Rails 4 migration. Fixing a few tests on layers activities #740
Partial commit 6 for the Rails 4 migration. All tests working! #740
Merge branch 'master' of github.com:instedd/resourcemap into ruby-2.1.2

# By Juan Wajnerman (21) and others
# Via Juan Wajnerman (3) and others
* 'master' of github.com:instedd/resourcemap: (61 commits)
  Use git describe for dist version
  Update deploy tasks to use github
  Replaced .hgignore with .gitignore
  Styling Site name's filter
  Site name's 'start with' filter fixed
  Remove 'has no value' filter for Site name (required)
  Verify collection authorization in the import wizard (fixes #734)
  Upgrade alto_guisso
  Notify changes so they're logged as an activity
  More French translations
  Updated JS French translations
  Activities French translations
  Updated po[t] files to match latest changes
  Replaced ids by names in the CSV new columns for hierarchies. Closes #608
  Make ancestors only work for id. It was not being used anywhere else
  Reversed ancestors list in order for high level hierarchy elements to be at the same column( Issue #608)
  Fixed performance issues on the implementation of Issue #608
  ascendants for hierarchy fields was not returning the same when cache_for_read was on
  Refactor: Moved functionality to subclasses. Added cache_for_read  for improving performance Rescue when calling ancestors because the values stored in ES can be invalid and  ascendants_of_in_hierarchy raise an exception if the parameter is invalid
  "Can't save" French translation
  ...

Conflicts:
	Gemfile.lock
	Rakefile
	app/models/collection.rb
	spec/models/field_spec.rb
Partial commit 6 for the Rails 4 migration. Gemfile.lock update #740
Partial commit 7 for the Rails 4 migration. Migrating rspec to 3.1 version. All tests working #740
Partial commit 7 for the Rails 4 migration. Migrating rspec to 3.1 version. All tests working. Fixing a few deprecations #740
Partial commit 8 for the Rails 4 migration. Migrating rspec to 3.1 version. All tests working. Fixing a few deprecations #740
Final commit for the rails 4.0.10 migration. Next: migrate to 4.1. Related to #740
Upgrading Rails to 4.1 and Rspec gems. Related to #740. 4 tests failing
Fixing Jasmine tests. Related to #740
Removing deprecated methods. Related to #740
Removing brakeman and updating haml and haml-magic-translations gems. Related to #740
Fixing a broken test. Related to #740
Fixing the strange float representation test failures. Related to #740