Merge pull request #303 from coopdevs/develop

Release January 2018 / 1

.rubocop.yml

@@ -188,7 +188,7 @@ SpecialGlobalVars:
   Enabled: false
 
 StringLiterals:
-  EnforcedStyle: double_quotes
+  EnforcedStyle: single_quotes
 
 VariableInterpolation:
   Enabled: false

CONTRIBUTING.en.md

@@ -0,0 +1,17 @@
+# Contribuciones
+
+Did you find a bug? Do you want to collaborate?
+
+Process:
+* Open a thread in [discourse](http://community.coopdevs.org/) to make sure whether it's a bug or a feature :wink:
+* Once we understand what the bug is about and know the steps to reproduce we will create an issue in GitHub linking to the Discourse thread.
+* Create a pull request to solve the issue
+* Report back to the discourse thread the bug has been solved linking to the pull request
+
+Visita [la guia para empezar a desarrollar para timeoverflow](https://github.com/coopdevs/timeoverflow/wiki/Getting-started)
+
+## Contributing with translations
+
+- Edit the translations directly on the [coopdevs/timeoverflow](https://www.localeapp.com/projects/10031) project on Locale.
+- **That's it!**
+- The maintainer will then pull translations from the Locale project and push to Github.

CONTRIBUTING.md

@@ -1,3 +1,6 @@
+Read this in English:
+[CONTRIBUTING.en.md](https://github.com/coopdevs/timeoverflow/blob/master/CONTRIBUTING.en.md)
+
 # Contribuciones
 
 ¿Has encontrado algún bug? ¿Quieres colaborar?
@@ -10,8 +13,8 @@ Proceso:
 
 Visita [la guia para empezar a desarrollar para timeoverflow](https://github.com/coopdevs/timeoverflow/wiki/Getting-started)
 
-## Contributing with translations
+## Contribuir con traducciones
 
-- Edit the translations directly on the [coopdevs/timeoverflow](https://www.localeapp.com/projects/10031) project on Locale.
-- **That's it!**
-- The maintainer will then pull translations from the Locale project and push to Github.
+- Modifica las traducciones directamente en el proyecto [coopdevs/timeoverflow](https://www.localeapp.com/projects/10031) en Locale.
+- **Eso es todo!**
+- El mantenedor obtendrá las nuevas tradcciones del proyecto de Locale y las publicará en Github.

Gemfile

@@ -1,9 +1,8 @@
 source 'https://rubygems.org'
 ruby '2.3.0'
 
-gem 'rails', '4.2.5.2'
+gem 'rails', '~> 4.2.7.1'
 gem 'rails-i18n'
-gem 'rails_12factor'
 gem "rdiscount"
 gem 'high_voltage', '~> 2.1.0'
 gem 'activeadmin', github: 'activeadmin'
@@ -17,13 +16,10 @@ gem "http_accept_language"
 gem 'thin'
 gem 'unicorn'
 gem 'foreman'
-gem 'dotenv-rails'
 gem 'kaminari'
 gem "simple_form", ">= 3.0.0"
-gem "awesome_print"
 gem 'memcachier'
 gem 'rollbar', '2.8.3'
-gem 'travis-lint'
 gem 'whenever', :require => false
 gem 'prawn'
 gem 'prawn-table'
@@ -50,15 +46,15 @@ group :development do
   gem 'web-console', '2.1.3'
   gem 'capistrano', '~> 3.1'
   gem 'capistrano-rails', '~> 1.1'
-  # gem 'capistrano3-delayed-job', '~> 1.0'
   gem 'airbrussh', require: false
   gem "quiet_assets"
   gem 'localeapp', '2.1.1', require: false
   gem 'letter_opener', '1.4.1'
+  gem 'dotenv-rails', '1.0.2'
 end
 
 group :development, :test do
-  gem "rspec-rails", '~> 3.4.0'
+  gem "rspec-rails", '~> 3.5.2'
   gem "capybara", '~> 2.4.4'
   gem "byebug"
 end
@@ -75,3 +71,7 @@ group :test do
   gem 'fabrication'
   gem 'faker'
 end
+
+group :production do
+  gem 'rails_12factor', '0.0.3'
+end