diff --git a/Gemfile b/Gemfile index c6407359..0abfaa78 100644 --- a/Gemfile +++ b/Gemfile @@ -4,12 +4,12 @@ source "https://rubygems.org" ruby RUBY_VERSION -gem "decidim", git: "https://github.com/OpenSourcePolitics/decidim.git" +gem "decidim", git: "https://github.com/decidim/decidim.git", branch: "0.8-stable" gem "decidim-export", git: "https://github.com/OpenSourcePolitics/decidim-user-export.git" # Uncomment the following line if you want to use decidim-assemblies plugin -# gem "decidim-assemblies", git: "https://github.com/OpenSourcePolitics/decidim.git" +# gem "decidim-assemblies", git: "https://github.com/decidim/decidim.git", branch: "0.8-stable" gem "puma", "~> 3.0" gem "uglifier", ">= 1.3.0" @@ -19,7 +19,7 @@ gem "faker", "~> 1.8.4" group :development, :test do gem "byebug", platform: :mri - gem "decidim-dev", git: "https://github.com/OpenSourcePolitics/decidim.git" + gem "decidim-dev", git: "https://github.com/decidim/decidim.git", branch: "0.8-stable" end group :development do @@ -38,7 +38,7 @@ group :production do gem 'dalli' gem 'sendgrid-ruby' gem 'newrelic_rpm' - gem 'lograge' + gem 'lograge', '~> 0.7.1' gem 'sentry-raven' gem 'sidekiq' end diff --git a/Gemfile.lock b/Gemfile.lock index de05fe91..f1159555 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -6,59 +6,58 @@ GIT decidim-core GIT - remote: https://github.com/OpenSourcePolitics/decidim.git - revision: de3465857b6bdc113ad8101bf09dd38c6ae698ca + remote: https://github.com/decidim/decidim.git + revision: 820f96f6cc4015f490c9969af7ebb1671be228d2 + branch: 0.8-stable specs: - decidim (0.8.3) - decidim-accountability (= 0.8.3) - decidim-admin (= 0.8.3) - decidim-api (= 0.8.3) - decidim-budgets (= 0.8.3) - decidim-comments (= 0.8.3) - decidim-core (= 0.8.3) - decidim-meetings (= 0.8.3) - decidim-pages (= 0.8.3) - decidim-participatory_processes (= 0.8.3) - decidim-proposals (= 0.8.3) - decidim-surveys (= 0.8.3) - decidim-system (= 0.8.3) - decidim-verifications (= 0.8.3) - decidim-accountability (0.8.3) - decidim-comments (= 0.8.3) - decidim-core (= 0.8.3) + decidim (0.8.4) + decidim-accountability (= 0.8.4) + decidim-admin (= 0.8.4) + decidim-api (= 0.8.4) + decidim-budgets (= 0.8.4) + decidim-comments (= 0.8.4) + decidim-core (= 0.8.4) + decidim-meetings (= 0.8.4) + decidim-pages (= 0.8.4) + decidim-participatory_processes (= 0.8.4) + decidim-proposals (= 0.8.4) + decidim-surveys (= 0.8.4) + decidim-system (= 0.8.4) + decidim-verifications (= 0.8.4) + decidim-accountability (0.8.4) + decidim-comments (= 0.8.4) + decidim-core (= 0.8.4) kaminari (~> 1.0.1) searchlight (~> 4.1.0) - decidim-admin (0.8.3) + decidim-admin (0.8.4) active_link_to (~> 1.0.0) - decidim-core (= 0.8.3) + decidim-core (= 0.8.4) devise (~> 4.2) devise-i18n (~> 1.2.0) devise_invitable (~> 1.7.0) jquery-rails (~> 4.3.1) sassc-rails (~> 1.3.0) select2-rails (~> 4.0.3) - decidim-api (0.8.3) + decidim-api (0.8.4) graphiql-rails (~> 1.4.2, < 1.4.5) graphql (~> 1.6.0) rack-cors (~> 1.0.1) sprockets-es6 (~> 0.9.2) - decidim-assemblies (0.8.3) - decidim-core (= 0.8.3) - decidim-budgets (0.8.3) - decidim-comments (= 0.8.3) - decidim-core (= 0.8.3) + decidim-budgets (0.8.4) + decidim-comments (= 0.8.4) + decidim-core (= 0.8.4) kaminari (~> 1.0.1) searchlight (~> 4.1.0) - decidim-comments (0.8.3) - decidim-core (= 0.8.3) + decidim-comments (0.8.4) + decidim-core (= 0.8.4) jquery-rails (~> 4.0) - decidim-core (0.8.3) + decidim-core (0.8.4) active_link_to (~> 1.0.4) autoprefixer-rails (~> 7.1.1) cancancan (~> 2.0.0) carrierwave (~> 1.1.0) date_validator (~> 0.9.0) - decidim-api (= 0.8.3) + decidim-api (= 0.8.4) devise (~> 4.3) devise-i18n (~> 1.2.0) file_validators (~> 2.1.0) @@ -89,14 +88,14 @@ GIT uglifier (~> 4.0.0) valid_email2 (~> 2.1.1) wisper (~> 2.0.0) - decidim-dev (0.8.3) + decidim-dev (0.8.4) byebug capybara (~> 2.15) capybara-screenshot (~> 1.0) codecov (~> 0.1.9) database_cleaner (~> 1.6) db-query-matchers (~> 0.9.0) - decidim (= 0.8.3) + decidim (= 0.8.4) factory_bot_rails (~> 4.8) i18n-tasks (= 0.9.18) listen (~> 3.1) @@ -111,36 +110,36 @@ GIT simplecov (~> 0.13) webmock (~> 3.0) wisper-rspec (~> 0.0.3) - decidim-meetings (0.8.3) + decidim-meetings (0.8.4) date_validator (~> 0.9) - decidim-core (= 0.8.3) + decidim-core (= 0.8.4) httparty (~> 0.15.0) icalendar (~> 2.4.1) jquery-tmpl-rails (~> 1.1.0) kaminari (~> 1.0.1) searchlight (~> 4.1.0) - decidim-pages (0.8.3) - decidim-core (= 0.8.3) - decidim-participatory_processes (0.8.3) - decidim-core (= 0.8.3) - decidim-proposals (0.8.3) - decidim-comments (= 0.8.3) - decidim-core (= 0.8.3) + decidim-pages (0.8.4) + decidim-core (= 0.8.4) + decidim-participatory_processes (0.8.4) + decidim-core (= 0.8.4) + decidim-proposals (0.8.4) + decidim-comments (= 0.8.4) + decidim-core (= 0.8.4) kaminari (~> 1.0.1) social-share-button (~> 1.0.0) - decidim-surveys (0.8.3) - decidim-core (= 0.8.3) + decidim-surveys (0.8.4) + decidim-core (= 0.8.4) jquery-tmpl-rails (~> 1.1.0) - decidim-system (0.8.3) + decidim-system (0.8.4) active_link_to (~> 1.0.0) - decidim-core (= 0.8.3) + decidim-core (= 0.8.4) devise (~> 4.2) devise-i18n (~> 1.2.0) devise_invitable (~> 1.7.1) jquery-rails (~> 4.3.1) sassc-rails (~> 1.3.0) - decidim-verifications (0.8.3) - decidim-core (= 0.8.3) + decidim-verifications (0.8.4) + decidim-core (= 0.8.4) GEM remote: https://rubygems.org/ @@ -188,7 +187,7 @@ GEM addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) arel (8.0.0) - ast (2.3.0) + ast (2.4.0) autoprefixer-rails (7.1.6) execjs axiom-types (0.1.1) @@ -202,7 +201,7 @@ GEM bcrypt (3.1.11) bindex (0.5.0) builder (3.2.3) - byebug (9.1.0) + byebug (10.0.0) cancancan (2.0.0) capybara (2.17.0) addressable @@ -250,7 +249,7 @@ GEM rspec (~> 3.0) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devise (4.4.0) + devise (4.4.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0, < 5.2) @@ -262,8 +261,7 @@ GEM devise (>= 4.0.0) diff-lcs (1.3) docile (1.1.5) - easy_translate (0.5.0) - json + easy_translate (0.5.1) thread thread_safe equalizer (0.0.11) @@ -322,7 +320,7 @@ GEM htmlentities (4.3.4) httparty (0.15.6) multi_xml (>= 0.5.2) - i18n (0.9.1) + i18n (0.9.3) concurrent-ruby (~> 1.0) i18n-tasks (0.9.18) activesupport (>= 4.0.2) @@ -363,7 +361,7 @@ GEM addressable (~> 2.3) letter_opener (1.6.0) launchy (~> 2.2) - letter_opener_web (1.3.1) + letter_opener_web (1.3.3) actionmailer (>= 3.2) letter_opener (~> 1.0) railties (>= 3.2) @@ -388,14 +386,14 @@ GEM mini_magick (4.8.0) mini_mime (1.0.0) mini_portile2 (2.3.0) - minitest (5.11.1) + minitest (5.11.3) multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) mustermann (1.0.1) - newrelic_rpm (4.7.1.340) + newrelic_rpm (4.8.0.341) nio4r (2.2.0) - nokogiri (1.8.1) + nokogiri (1.8.2) mini_portile2 (~> 2.3.0) oauth (0.5.4) oauth2 (1.4.0) @@ -409,11 +407,10 @@ GEM rack (>= 1.6.2, < 3) omniauth-facebook (4.0.0) omniauth-oauth2 (~> 1.2) - omniauth-google-oauth2 (0.5.2) - jwt (~> 1.5) - multi_json (~> 1.3) + omniauth-google-oauth2 (0.5.3) + jwt (>= 1.5) omniauth (>= 1.1.1) - omniauth-oauth2 (>= 1.3.1) + omniauth-oauth2 (>= 1.5) omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) @@ -430,7 +427,7 @@ GEM parallel (1.12.1) parser (2.4.0.2) ast (~> 2.3) - passenger (5.1.12) + passenger (5.2.0) rack rake (>= 0.8.1) pg (0.21.0) @@ -443,8 +440,8 @@ GEM actionmailer (>= 3, < 6) premailer (~> 1.7, >= 1.7.9) public_suffix (3.0.1) - puma (3.11.0) - rack (2.0.3) + puma (3.11.2) + rack (2.0.4) rack-cors (1.0.2) rack-protection (2.0.0) rack @@ -521,7 +518,7 @@ GEM rspec-expectations (~> 3.7.0) rspec-mocks (~> 3.7.0) rspec-support (~> 3.7.0) - rspec-support (3.7.0) + rspec-support (3.7.1) rubocop (0.51.0) parallel (~> 1.10) parser (>= 2.3.3.1, < 3.0) @@ -625,7 +622,7 @@ GEM activemodel (>= 5.0) bindex (>= 0.4.0) railties (>= 5.0) - webmock (3.2.1) + webmock (3.3.0) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff @@ -644,14 +641,13 @@ DEPENDENCIES byebug dalli decidim! - decidim-assemblies! decidim-dev! decidim-export! faker (~> 1.8.4) fog-aws letter_opener_web (~> 1.3.0) listen (~> 3.1.0) - lograge + lograge (~> 0.7.1) newrelic_rpm passenger puma (~> 3.0) diff --git a/config/database.yml b/config/database.yml index 009aac4e..c204e346 100644 --- a/config/database.yml +++ b/config/database.yml @@ -25,10 +25,10 @@ default: &default host: <%= ENV.fetch("DATABASE_HOST") { "localhost" } %> username: <%= ENV.fetch("DATABASE_USERNAME") { "" } %> password: <%= ENV.fetch("DATABASE_PASSWORD") { "" } %> + database: <%= ENV.fetch("DATABASE_NAME") { "osp_app" } %> development: <<: *default - database: <%= ENV.fetch("DATABASE_NAME") { "development_app_development" } %> # The specified database role being used to connect to postgres. # To create additional roles in postgres see `$ createuser --help`. @@ -62,7 +62,7 @@ development: # Do not set this db to the same as development or production. test: <<: *default - database: <%= ENV.fetch("DATABASE_NAME") { "development_app_test" } %> + database: <%= ENV.fetch("DATABASE_NAME") { "osp_app_test" } %> # As with config/secrets.yml, you never want to store sensitive information, # like your database password, in your source code. If your source code is @@ -84,4 +84,5 @@ test: # url: <%= ENV['DATABASE_URL'] %> # production: - url: <%= ENV['DATABASE_URL'] %> + <<: *default + # url: <%= ENV['DATABASE_URL'] %> diff --git a/config/environments/production.rb b/config/environments/production.rb index ef604056..f28ff037 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -33,14 +33,15 @@ # Disable serving static files from the `/public` folder by default since # Apache or NGINX already handles this. - config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + # config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + config.public_file_server.enabled = true # Compress JavaScripts and CSS. config.assets.js_compressor = Uglifier.new(:harmony => true) - # config.assets.css_compressor = :sass + config.assets.css_compressor = :sass # Do not fallback to assets pipeline if a precompiled asset is missed. - config.assets.compile = false + config.assets.compile = true # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb diff --git a/config/initializers/decidim.rb b/config/initializers/decidim.rb index 2245fbdc..74f33c4a 100644 --- a/config/initializers/decidim.rb +++ b/config/initializers/decidim.rb @@ -5,8 +5,8 @@ config.mailer_sender = "mako@osp.cat" # Change these lines to set your preferred locales - config.default_locale = :en - config.available_locales = [:en, :fr, :ca, :es] + config.default_locale = :fr + config.available_locales = [:en, :fr] # Geocoder configuration # config.geocoder = { @@ -40,7 +40,7 @@ # that an organization's administrator injects malicious scripts to spy on or # take over user accounts. # - config.enable_html_header_snippets = false + config.enable_html_header_snippets = true if ENV["HEROKU_APP_NAME"].present? config.base_uploads_path = ENV["HEROKU_APP_NAME"] + "/" diff --git a/config/initializers/new_framework_defaults_5_1.rb b/config/initializers/new_framework_defaults_5_1.rb new file mode 100644 index 00000000..9010abd5 --- /dev/null +++ b/config/initializers/new_framework_defaults_5_1.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. +# +# This file contains migration options to ease your Rails 5.1 upgrade. +# +# Once upgraded flip defaults one by one to migrate to the new default. +# +# Read the Guide for Upgrading Ruby on Rails for more info on each option. + +# Make `form_with` generate non-remote forms. +Rails.application.config.action_view.form_with_generates_remote_forms = false + +# Unknown asset fallback will return the path passed in when the given +# asset is not present in the asset pipeline. +# Rails.application.config.assets.unknown_asset_fallback = false diff --git a/package.json b/package.json index 6a4d7530..b54696fa 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,6 @@ { - "name": "development_app", + "name": "osp-app", + "version": "0.8.4", "private": true, "dependencies": {} }