Commit Graph

225 Commits

Author SHA1 Message Date
ArturT
79e684e68e Use latest version of knapsack_pro 0.53.0 2017-12-05 20:10:40 +01:00
rgarcia
e2d4fbd9ce knapsack_pro setup 2017-12-05 20:10:40 +01:00
Bertocq
95571d63db Fixes on docker usage instructions 2017-11-15 17:53:05 +01:00
BertoCQ
779f76fce4 Merge pull request #2127 from denialtorres/master
Add a Dockerfile config file
2017-11-15 17:44:47 +01:00
Daniel
a715df3431 fix the warning of secret_key for devise 2017-11-15 08:10:14 -06:00
Angel Perez
285ab9f9d5 Update Rails to version 4.2.10 2017-11-14 10:18:52 -04:00
Daniel
3e42182551 added Dockerfile and docker-compose.yml 2017-11-14 04:33:05 -06:00
Bertocq
495a99359c Move rubocop from development & test gemfile group to just development 2017-11-11 18:58:59 +01:00
depfu[bot]
2fde9ec1b8 Upgrade byebug to version 9.1.0 2017-09-29 12:00:16 +00:00
Senén Rodero Rodríguez
6c1d1c2cde Add map settings to backend. Install leaflet assets to render maps. 2017-09-27 14:46:02 +02:00
Bertocq
e4e78c8f16 Rubocop autocorrections 2017-09-14 15:08:35 +02:00
Raimond Garcia
65e1867af8 Merge pull request #1821 from consul/depfu/upgrade/database_cleaner-1.6.1
Upgrade database_cleaner to version 1.6.1
2017-09-05 18:18:16 +02:00
Raimond Garcia
ac5933f4c2 Merge pull request #1820 from consul/depfu/upgrade/pg-0.21.0
Upgrade pg to version 0.21.0
2017-09-05 18:18:06 +02:00
depfu[bot]
5923ca38fd Upgrade database_cleaner to version 1.6.1 2017-09-05 16:00:28 +00:00
depfu[bot]
7a0a91f647 Upgrade pg to version 0.21.0 2017-09-05 15:35:25 +00:00
depfu[bot]
4ec40f54fb Upgrade scss_lint to version 0.54.0 2017-09-05 15:15:22 +00:00
Senén Rodero Rodríguez
9a0b34fffe Install jquery-file-upload assets for rails. 2017-08-25 18:34:51 +02:00
Bertocq
8f97bd86b7 Specify version for all gems 2017-07-10 12:52:04 +02:00
Bertocq
3f9d95f6a3 Sort all gems in Gemfile 2017-07-10 12:18:49 +02:00
Bertocq
862a30b493 Remove unnecesary comments on gemfile 2017-07-10 12:05:34 +02:00
Bertocq
100926162e Remove therubyracer gem, never used 2017-07-10 12:05:34 +02:00
Bertocq
efa2e7c774 Remove bcrypt gem, never used 2017-07-10 12:05:34 +02:00
Bertocq
5763ee03f4 Sort gem names alphabetically for dev and test groups 2017-07-10 12:05:34 +02:00
Bertocq
4e4f316f94 Reorganize development and test gems 2017-07-10 12:05:34 +02:00
Raimond Garcia
6fc5b1e8c9 Merge pull request #1735 from consul/chore/upgrade_initialjs-rails
Upgrade initialjs-rails gem
2017-07-10 12:03:21 +02:00
Bertocq
74e2c406d4 Upgrade initialjs-rails gem version
In order to avoid some html validations a PR was opened https://github.com/dgilperez/initialjs-rails/pull/6 and later on merged with some extra specs coverage https://github.com/dgilperez/initialjs-rails/pull/7 Thanks @dgilperez and @decabeza!!
2017-07-10 01:01:32 +02:00
Bertocq
8b2b21c6d7 Remove Tolk, Crowdin substituted it
Why:

* Crowdin now hosts all consul translations publicly so anyone can contribute https://crowdin.com/project/consul/invite
* Crowdin makes easy for non-tech people to contribute, once we have a demo site we'll be able to offer "on site" translation
* If you still use Tolk, we recommend removing this commit (but adding tolk gem to ./Gemfile_custom file to avoid future merge conflicts)

How:

* Reverting changes introduced with 9610a6a933
2017-07-09 00:56:14 +02:00
Bertocq
c9bc028524 Remove all unnecesary extra spacing and Layout/ExtraSpacing list from rubocop file 2017-06-28 14:12:51 +02:00
Juanjo Bazán
10d418efd8 rails up to 4.2.9 2017-06-27 11:37:37 +02:00
Raimond Garcia
f1e4e5f206 Merge pull request #1656 from consul/chore/add_markdownlinter
Add Markdown Linter gem and config file && Fixes
2017-06-19 10:46:31 +02:00
Bertocq
e1573e55b5 Add scss-lint gem for sass linting 2017-06-16 12:07:37 +02:00
rgarcia
3a50cc3a99 Enables GraphQL UI in production 2017-06-15 12:12:41 +02:00
Bertocq
aa405abf63 Add markdownlinter gem to development group 2017-06-14 18:13:36 +02:00
Juanjo Bazán
aa29905e31 updates graphql 2017-06-14 10:44:33 +02:00
kikito
1701111bf5 Merge branch 'api-dev-PRs' of https://github.com/amiedes/consul into amiedes-api-dev-PRs-2 2017-06-13 12:07:28 +02:00
Juanjo Bazán
16edbf15a2 Merge pull request #1620 from consul/medialab-legislation
Adds Collaborative Legislation
2017-06-07 18:06:15 +02:00
Juanjo Bazán
77b596b285 updates rubocop (sec fix)
fixes a current vulnerability in /tmp directory
(https://github.com/bbatsov/rubocop/commit/dcb258fabd5f2624c1ea0e1634763
094590c09d7)
2017-06-03 13:07:02 +02:00
rgarcia
1a46b4d4cb fixes conflicts with master 2017-05-31 10:36:38 +02:00
Bertocq
6b89bdd17d Revert Gemfile.lock changes by mistake, also remove Gemfile gem version specification 2017-05-23 20:26:39 +02:00
Bertocq
d922d093ee Add specifiy version to multiple gems that didn't had one at the Gemfile 2017-05-23 19:52:14 +02:00
rgarcia
2a7ff2270e sends zip file with test data 2017-05-23 16:45:34 +02:00
decabeza
5e0d5fc8c3 Merge branch 'legislation-module-stable' of https://github.com/medialab-prado/consul into medialab-legislation 2017-05-22 18:43:49 +02:00
Alberto Miedes Garcés
cad66ea85a Update GraphQL and GraphiQL gem 2017-05-11 22:29:21 +02:00
Alberto Miedes Garcés
5d9054d284 Merge branch 'master' into api-dev-PRs
Conflicts:
	Gemfile.lock
	config/routes.rb
	db/dev_seeds.rb
	db/schema.rb
2017-05-11 21:59:42 +02:00
Juanjo Bazán
887e40bb59 updates dependencies 2017-05-05 11:32:13 +02:00
Juanjo Bazán
f80019aa1f updates ahoy 2017-05-01 12:35:57 +02:00
Juanjo Bazán
29e5cff13f updates capistrano 2017-05-01 12:20:52 +02:00
Juanjo Bazán
d8716cc72d updates gem versions 2017-05-01 12:19:24 +02:00
Juanjo Bazán
b5e1ba9a53 updates gems 2017-04-17 18:55:19 +02:00
Amaia Castro
8143fe1037 Site customization: images uploads 2017-04-06 17:00:04 +02:00