From f1b1f5102e51233f3840445d01d4856275078a54 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Tue, 21 Mar 2017 16:25:01 +0100 Subject: [PATCH 01/17] Remove the railroady gem (unused) --- Gemfile | 2 -- Gemfile.lock | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 20bc62a0a..09cefe2dd 100644 --- a/Gemfile +++ b/Gemfile @@ -144,8 +144,6 @@ group :development, :test do gem 'spring-commands-rspec' gem 'rspec-rails', '~> 3.0' - gem 'railroady' - gem 'rubocop', require: false gem 'rubocop-checkstyle_formatter', require: false gem 'rubocop-rspec', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 353b2160a..2798bedbc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -436,7 +436,6 @@ GEM rack (>= 1.1) rack-test (0.6.3) rack (>= 1.0) - railroady (1.5.2) rails (5.0.0.1) actioncable (= 5.0.0.1) actionmailer (= 5.0.0.1) @@ -698,7 +697,6 @@ DEPENDENCIES poltergeist pry-byebug rack-handlers - railroady rails (= 5.0.0.1) rails-controller-testing redis @@ -735,4 +733,4 @@ DEPENDENCIES xray-rails BUNDLED WITH - 1.14.4 + 1.14.6 From 0483fe028fb506f034852eda3fc8ff55dfdc36d0 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Tue, 21 Mar 2017 16:27:13 +0100 Subject: [PATCH 02/17] Remove the parallel_test gem --- Gemfile | 2 -- Gemfile.lock | 4 ---- config/database.yml | 2 +- spec/spec_helper.rb | 2 +- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index 09cefe2dd..dabd95b33 100644 --- a/Gemfile +++ b/Gemfile @@ -148,8 +148,6 @@ group :development, :test do gem 'rubocop-checkstyle_formatter', require: false gem 'rubocop-rspec', require: false - gem 'parallel_tests', '~> 2.10' - gem 'brakeman', require: false # Deploy diff --git a/Gemfile.lock b/Gemfile.lock index 2798bedbc..bd91986fa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -406,9 +406,6 @@ GEM openstack (3.3.7) json orm_adapter (0.5.0) - parallel (1.10.0) - parallel_tests (2.10.0) - parallel parser (2.3.3.1) ast (~> 2.2) pg (0.19.0) @@ -692,7 +689,6 @@ DEPENDENCIES newrelic_rpm openid_connect openstack - parallel_tests (~> 2.10) pg poltergeist pry-byebug diff --git a/config/database.yml b/config/database.yml index 09ce42682..00832cfbc 100644 --- a/config/database.yml +++ b/config/database.yml @@ -13,4 +13,4 @@ test: adapter: sqlite3 pool: 5 timeout: 5000 - database: db/test<%= ENV['TEST_ENV_NUMBER'] %>.sqlite3 + database: db/test.sqlite3 diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 4e7319f2a..0e6649d7d 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -38,7 +38,7 @@ require 'capybara/poltergeist' Capybara.javascript_driver = :poltergeist Capybara.ignore_hidden_elements = false Capybara.register_driver :poltergeist do |app| - Capybara::Poltergeist::Driver.new(app, js_errors: true, port: 44_678 + ENV['TEST_ENV_NUMBER'].to_i, phantomjs_options: ['--proxy-type=none'], timeout: 180) + Capybara::Poltergeist::Driver.new(app, js_errors: true, port: 44_678, phantomjs_options: ['--proxy-type=none'], timeout: 180) end ActiveSupport::Deprecation.silenced = true From abfb6772cfc0bef88c297bf86cbbb667652be02d Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Tue, 21 Mar 2017 16:27:54 +0100 Subject: [PATCH 03/17] Remove commented instructions in the Gemfile --- Gemfile | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Gemfile b/Gemfile index dabd95b33..f2a377e6a 100644 --- a/Gemfile +++ b/Gemfile @@ -28,15 +28,9 @@ gem 'sdoc', '~> 0.4.0', group: :doc # Enable deep clone of active record models gem 'deep_cloneable', '~> 2.2.1' -# Use ActiveModel has_secure_password -# gem 'bcrypt', '~> 3.1.7' - # Use Unicorn as the app server gem 'unicorn' -# Use Capistrano for deployment -# gem 'capistrano-rails', group: :development - # serializer gem 'active_model_serializers' @@ -132,9 +126,6 @@ group :development do end group :development, :test do - # gem 'terminal-notifier' - # gem 'terminal-notifier-guard' - # Call 'byebug' anywhere in the code to stop execution and get a debugger console gem 'byebug' gem 'pry-byebug' From ff1709468a79442728b073e3e30f928cb1f89a19 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Tue, 21 Mar 2017 16:28:46 +0100 Subject: [PATCH 04/17] Move dotenv-rails directly into the dev/test Gemfile group --- Gemfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index f2a377e6a..322b92eaa 100644 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,5 @@ source 'https://rubygems.org' -# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'dotenv-rails', groups: [:development, :test] - gem 'rails', '5.0.0.1' gem 'actioncable', '5.0.0.1' @@ -143,6 +140,9 @@ group :development, :test do # Deploy gem 'mina', ref: '343a7', git: 'https://github.com/mina-deploy/mina.git' + + # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' + gem 'dotenv-rails' end group :production, :staging do From acc5fff05defe77ccf1a32b898dcd33b221c5114 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Tue, 21 Mar 2017 16:32:44 +0100 Subject: [PATCH 05/17] Remove therubyracer gem (unused) --- Gemfile | 3 --- Gemfile.lock | 6 ------ 2 files changed, 9 deletions(-) diff --git a/Gemfile b/Gemfile index 322b92eaa..d7f9ba7a1 100644 --- a/Gemfile +++ b/Gemfile @@ -10,9 +10,6 @@ gem 'sass-rails', '~> 5.0' # Use Uglifier as compressor for JavaScript assets gem 'uglifier', '>= 1.3.0' -# See https://github.com/sstephenson/execjs#readme for more supported runtimes -gem 'therubyracer', platforms: :ruby - # Use jquery as the JavaScript library gem 'jquery-rails' # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks diff --git a/Gemfile.lock b/Gemfile.lock index bd91986fa..0cb381a9c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -352,7 +352,6 @@ GEM leaflet-markercluster-rails (0.7.0) railties (>= 3.1) leaflet-rails (0.7.7) - libv8 (3.16.14.17) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -473,7 +472,6 @@ GEM trollop (~> 2.1) rdoc (4.3.0) redis (3.3.0) - ref (2.0.0) request_store (1.3.1) responders (2.3.0) railties (>= 4.2.0, < 5.1) @@ -586,9 +584,6 @@ GEM httpclient (>= 2.4) i18n json (>= 1.4.3) - therubyracer (0.12.2) - libv8 (~> 3.16.14.0) - ref thor (0.19.4) thread_safe (0.3.5) tilt (2.0.5) @@ -716,7 +711,6 @@ DEPENDENCIES spring spring-commands-rspec sqlite3 - therubyracer timecop turbolinks (~> 2.5) uglifier (>= 1.3.0) From 4c3e5a6fadefb5e3ad6a1af07cfd9db6aede7646 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Tue, 21 Mar 2017 16:34:13 +0100 Subject: [PATCH 06/17] Remove the jbuilder gem (unused) --- Gemfile | 2 -- Gemfile.lock | 4 ---- 2 files changed, 6 deletions(-) diff --git a/Gemfile b/Gemfile index d7f9ba7a1..6b430bfde 100644 --- a/Gemfile +++ b/Gemfile @@ -14,8 +14,6 @@ gem 'uglifier', '>= 1.3.0' gem 'jquery-rails' # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks gem 'turbolinks', '~> 2.5' -# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder -gem 'jbuilder', '~> 2.0' # bundle exec rake doc:rails generates the API under doc/api. gem 'sdoc', '~> 0.4.0', group: :doc diff --git a/Gemfile.lock b/Gemfile.lock index 0cb381a9c..377312095 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -326,9 +326,6 @@ GEM i18n (0.7.0) inflecto (0.0.2) ipaddress (0.8.3) - jbuilder (2.6.1) - activesupport (>= 3.0.0, < 5.1) - multi_json (~> 1.2) jquery-rails (4.2.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) @@ -671,7 +668,6 @@ DEPENDENCIES guard-rspec haml-rails hashie - jbuilder (~> 2.0) jquery-rails launchy leaflet-draw-rails From 4675a84f9ea73ed59916443f68d30e9f83b7b918 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Tue, 21 Mar 2017 16:45:42 +0100 Subject: [PATCH 07/17] Add spacing in the Gemfile --- Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile b/Gemfile index 6b430bfde..a09b94411 100644 --- a/Gemfile +++ b/Gemfile @@ -37,6 +37,7 @@ gem 'will_paginate-bootstrap' # Decorators gem 'draper', '~> 3.0.0.pre1' + gem 'unicode_utils' #Gestion des comptes utilisateurs From 4dc4f669e873bae361d2fb3234d3bf0484983236 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Tue, 21 Mar 2017 16:46:13 +0100 Subject: [PATCH 08/17] =?UTF-8?q?Improve=20the=20Gemfile=20comments?= =?UTF-8?q?=E2=80=99=20formatting?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index a09b94411..c370fbc0f 100644 --- a/Gemfile +++ b/Gemfile @@ -26,10 +26,10 @@ gem 'unicorn' # serializer gem 'active_model_serializers' -#haml +# haml gem 'haml-rails' -#bootstrap saas +# bootstrap saas gem 'bootstrap-sass', '~> 3.3.5' # Pagination @@ -40,7 +40,7 @@ gem 'draper', '~> 3.0.0.pre1' gem 'unicode_utils' -#Gestion des comptes utilisateurs +# Gestion des comptes utilisateurs gem 'devise' gem 'openid_connect' @@ -79,7 +79,8 @@ gem 'as_csv' gem 'spreadsheet_architect' gem 'apipie-rails' -gem "maruku" # for Markdown support in apipie +# For Markdown support in apipie +gem "maruku" gem 'openstack' From 3eef853d59b641104a218b9cc6c50f9fbf47ba03 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Tue, 21 Mar 2017 16:46:41 +0100 Subject: [PATCH 09/17] Use single-quotes everywhere in the Gemfile --- Gemfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index c370fbc0f..9d0f420fb 100644 --- a/Gemfile +++ b/Gemfile @@ -65,13 +65,13 @@ gem 'chartkick' gem 'logstasher' -gem "font-awesome-rails" +gem 'font-awesome-rails' gem 'hashie' gem 'mailjet' -gem "smart_listing" +gem 'smart_listing' gem 'bootstrap-wysihtml5-rails', '~> 0.3.3.8' @@ -80,7 +80,7 @@ gem 'spreadsheet_architect' gem 'apipie-rails' # For Markdown support in apipie -gem "maruku" +gem 'maruku' gem 'openstack' From 6404c7a4221287bf15e78418f4dd2b3531a90016 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Tue, 21 Mar 2017 17:30:20 +0100 Subject: [PATCH 10/17] Remove the selenium-webdriver gem (unused) --- Gemfile | 1 - Gemfile.lock | 8 -------- 2 files changed, 9 deletions(-) diff --git a/Gemfile b/Gemfile index 9d0f420fb..2e38473b2 100644 --- a/Gemfile +++ b/Gemfile @@ -97,7 +97,6 @@ group :test do gem 'launchy' gem 'factory_girl' gem 'database_cleaner' - gem 'selenium-webdriver' gem 'webmock' gem 'shoulda-matchers', require: false gem 'simplecov', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 377312095..5a218baa9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -101,8 +101,6 @@ GEM mime-types (>= 1.16) mimemagic (>= 0.3.0) chartkick (2.2.1) - childprocess (0.5.9) - ffi (~> 1.0, >= 1.0.11) clamav-client (3.1.0) cliver (0.3.2) coderay (1.1.1) @@ -536,10 +534,6 @@ GEM securecompare (1.0.0) select2-rails (4.0.3) thor (~> 0.14) - selenium-webdriver (3.0.3) - childprocess (~> 0.5) - rubyzip (~> 1.0) - websocket (~> 1.0) sentry-raven (2.2.0) faraday (>= 0.7.6, < 1.0) sexp_processor (4.7.0) @@ -623,7 +617,6 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff - websocket (1.2.3) websocket-driver (0.6.4) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) @@ -697,7 +690,6 @@ DEPENDENCIES scenic sdoc (~> 0.4.0) select2-rails - selenium-webdriver sentry-raven shoulda-matchers simple_form From d41dabe00a558fa22e3c7645845e9fa6b37fbf0c Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Tue, 21 Mar 2017 17:39:00 +0100 Subject: [PATCH 11/17] Remove the simplecov gem (unused) --- Gemfile | 1 - Gemfile.lock | 7 ------- spec/spec_helper.rb | 6 ------ 3 files changed, 14 deletions(-) diff --git a/Gemfile b/Gemfile index 2e38473b2..31185efe5 100644 --- a/Gemfile +++ b/Gemfile @@ -99,7 +99,6 @@ group :test do gem 'database_cleaner' gem 'webmock' gem 'shoulda-matchers', require: false - gem 'simplecov', require: false gem 'poltergeist' gem 'timecop' gem 'guard' diff --git a/Gemfile.lock b/Gemfile.lock index 5a218baa9..cb1e02025 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -125,7 +125,6 @@ GEM responders warden (~> 1.2.3) diff-lcs (1.2.5) - docile (1.1.5) domain_name (0.5.20161129) unf (>= 0.0.5, < 1.0.0) dotenv (2.2.0) @@ -543,11 +542,6 @@ GEM simple_form (3.4.0) actionpack (> 4, < 5.1) activemodel (> 4, < 5.1) - simplecov (0.12.0) - docile (~> 1.1.0) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) slop (3.6.0) smart_listing (1.2.0) coffee-rails @@ -693,7 +687,6 @@ DEPENDENCIES sentry-raven shoulda-matchers simple_form - simplecov smart_listing spreadsheet_architect spring diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 0e6649d7d..f3b8d6030 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -19,12 +19,6 @@ ENV['RAILS_ENV'] ||= 'test' -if ENV['COV'] - require 'simplecov' - SimpleCov.start 'rails' - puts "required simplecov" -end - require File.expand_path('../../config/environment', __FILE__) require 'rspec/rails' require 'capybara/rspec' From f393b96dea4a19fc22f891ecf7b1318ed8ec5a52 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Tue, 21 Mar 2017 17:46:10 +0100 Subject: [PATCH 12/17] Remove rubocop for now --- .gitignore | 1 - .rubocop.yml | 7 ------- Gemfile | 4 ---- Gemfile.lock | 20 -------------------- 4 files changed, 32 deletions(-) delete mode 100644 .rubocop.yml diff --git a/.gitignore b/.gitignore index 1cdb725a2..8d761de27 100644 --- a/.gitignore +++ b/.gitignore @@ -27,7 +27,6 @@ bin/* config/initializers/token.rb config/initializers/super_admin.rb doc/*.svg -rubocop.html config/france_connect.yml config/initializers/mailjet.rb config/fog_credentials.yml diff --git a/.rubocop.yml b/.rubocop.yml deleted file mode 100644 index 341d26106..000000000 --- a/.rubocop.yml +++ /dev/null @@ -1,7 +0,0 @@ -require: rubocop-rspec -AllCops: - Exclude: - - db/**/* - RunRailsCops: true -Metrics/LineLength: - Enabled: false diff --git a/Gemfile b/Gemfile index 31185efe5..305348d34 100644 --- a/Gemfile +++ b/Gemfile @@ -127,10 +127,6 @@ group :development, :test do gem 'spring-commands-rspec' gem 'rspec-rails', '~> 3.0' - gem 'rubocop', require: false - gem 'rubocop-checkstyle_formatter', require: false - gem 'rubocop-rspec', require: false - gem 'brakeman', require: false # Deploy diff --git a/Gemfile.lock b/Gemfile.lock index cb1e02025..1ab3142a3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -66,7 +66,6 @@ GEM actionpack (>= 3.0) activemodel (>= 3.0) responders - ast (2.3.0) attr_required (1.0.1) autoprefixer-rails (6.5.4) execjs @@ -399,14 +398,11 @@ GEM openstack (3.3.7) json orm_adapter (0.5.0) - parser (2.3.3.1) - ast (~> 2.2) pg (0.19.0) poltergeist (1.12.0) capybara (~> 2.1) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) - powerpack (0.1.1) pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) @@ -453,7 +449,6 @@ GEM method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rainbow (2.1.0) raindrops (0.17.0) rake (12.0.0) rb-fsevent (0.9.8) @@ -501,17 +496,6 @@ GEM rspec-mocks (~> 3.5.0) rspec-support (~> 3.5.0) rspec-support (3.5.0) - rubocop (0.46.0) - parser (>= 2.3.1.1, < 3.0) - powerpack (~> 0.1) - rainbow (>= 1.99.1, < 3.0) - ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.0, >= 1.0.1) - rubocop-checkstyle_formatter (0.3.0) - rubocop (>= 0.30.1) - rubocop-rspec (1.8.0) - rubocop (>= 0.42.0) - ruby-progressbar (1.8.1) ruby_dep (1.5.0) ruby_parser (3.8.3) sexp_processor (~> 4.1) @@ -583,7 +567,6 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.2) - unicode-display_width (1.1.2) unicode_utils (1.4.0) unicorn (5.2.0) kgio (~> 2.6) @@ -677,9 +660,6 @@ DEPENDENCIES rest-client rgeo-geojson rspec-rails (~> 3.0) - rubocop - rubocop-checkstyle_formatter - rubocop-rspec sass-rails (~> 5.0) scenic sdoc (~> 0.4.0) From ed11b667789382055859b20a9479325bde1f4dac Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Tue, 21 Mar 2017 17:47:47 +0100 Subject: [PATCH 13/17] Remove brakeman for now --- Gemfile | 2 -- Gemfile.lock | 2 -- 2 files changed, 4 deletions(-) diff --git a/Gemfile b/Gemfile index 305348d34..3212f4ead 100644 --- a/Gemfile +++ b/Gemfile @@ -127,8 +127,6 @@ group :development, :test do gem 'spring-commands-rspec' gem 'rspec-rails', '~> 3.0' - gem 'brakeman', require: false - # Deploy gem 'mina', ref: '343a7', git: 'https://github.com/mina-deploy/mina.git' diff --git a/Gemfile.lock b/Gemfile.lock index 1ab3142a3..c500f8330 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -82,7 +82,6 @@ GEM sass (>= 3.3.4) bootstrap-wysihtml5-rails (0.3.3.8) railties (>= 3.0) - brakeman (3.4.1) browser (2.3.0) builder (3.2.2) byebug (9.0.6) @@ -617,7 +616,6 @@ DEPENDENCIES bootstrap-datepicker-rails bootstrap-sass (~> 3.3.5) bootstrap-wysihtml5-rails (~> 0.3.3.8) - brakeman browser byebug capybara From 9c91cbe78df8d2e93b2657113309f5433d9e3818 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Tue, 21 Mar 2017 19:10:41 +0100 Subject: [PATCH 14/17] Group the scenic gem declaration --- Gemfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 3212f4ead..70fb8a8a6 100644 --- a/Gemfile +++ b/Gemfile @@ -114,7 +114,6 @@ group :development do gem 'web-console' gem 'rack-handlers' gem 'xray-rails' - gem 'scenic' end group :development, :test do @@ -134,7 +133,10 @@ group :development, :test do gem 'dotenv-rails' end -group :production, :staging do +group :development, :production, :staging do gem 'scenic' +end + +group :production, :staging do gem 'sentry-raven' end From 5910d28a0265de19ebeb103759e9f3c04e3ec0c2 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Wed, 22 Mar 2017 14:37:14 +0100 Subject: [PATCH 15/17] Revert "Remove therubyracer gem (unused)" This reverts commit acc5fff05defe77ccf1a32b898dcd33b221c5114. --- Gemfile | 3 +++ Gemfile.lock | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/Gemfile b/Gemfile index 70fb8a8a6..4a5d5c04c 100644 --- a/Gemfile +++ b/Gemfile @@ -10,6 +10,9 @@ gem 'sass-rails', '~> 5.0' # Use Uglifier as compressor for JavaScript assets gem 'uglifier', '>= 1.3.0' +# See https://github.com/sstephenson/execjs#readme for more supported runtimes +gem 'therubyracer', platforms: :ruby + # Use jquery as the JavaScript library gem 'jquery-rails' # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks diff --git a/Gemfile.lock b/Gemfile.lock index c500f8330..d102a7b69 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -344,6 +344,7 @@ GEM leaflet-markercluster-rails (0.7.0) railties (>= 3.1) leaflet-rails (0.7.7) + libv8 (3.16.14.17) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -460,6 +461,7 @@ GEM trollop (~> 2.1) rdoc (4.3.0) redis (3.3.0) + ref (2.0.0) request_store (1.3.1) responders (2.3.0) railties (>= 4.2.0, < 5.1) @@ -552,6 +554,9 @@ GEM httpclient (>= 2.4) i18n json (>= 1.4.3) + therubyracer (0.12.2) + libv8 (~> 3.16.14.0) + ref thor (0.19.4) thread_safe (0.3.5) tilt (2.0.5) @@ -670,6 +675,7 @@ DEPENDENCIES spring spring-commands-rspec sqlite3 + therubyracer timecop turbolinks (~> 2.5) uglifier (>= 1.3.0) From 458f557c9350213b74b4b151c4eb7423b73eb099 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Wed, 22 Mar 2017 14:37:06 +0100 Subject: [PATCH 16/17] Add a sort order to the demo procedures list --- app/controllers/demo_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/demo_controller.rb b/app/controllers/demo_controller.rb index 89f1da027..5933c5735 100644 --- a/app/controllers/demo_controller.rb +++ b/app/controllers/demo_controller.rb @@ -6,7 +6,7 @@ class DemoController < ApplicationController return redirect_to root_path if Rails.env.production? smart_listing_create :procedures, - Procedure.where(archived: false, published: true), + Procedure.where(archived: false, published: true).order("id DESC"), partial: "demo/list", array: true end From 7d9c8db659c7241f65749ab9331148d31c09eb94 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Mon, 27 Mar 2017 11:36:37 +0200 Subject: [PATCH 17/17] Update the apipie_examples JSON so that it shows champs_private --- doc/apipie_examples.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/doc/apipie_examples.json b/doc/apipie_examples.json index 968788243..e14456d96 100644 --- a/doc/apipie_examples.json +++ b/doc/apipie_examples.json @@ -86,6 +86,18 @@ } } ], + "champs_private": [ + { + "value": null, + "type_de_champ": { + "id": 1, + "libelle": "Description privée", + "type_champ": "text", + "order_place": 0, + "description": "description privée" + } + } + ], "pieces_justificatives": [ { "url": null,