decidim 0.20.0 → 0.23.1.rc1

data/docs/services/social_providers.md

@@ -1,6 +1,18 @@
 # Social providers integration
 
-If you want to enable sign up through social providers like Facebook you will need to generate app credentials and write them into the Rails secrets file: `config/secrets.yml`.
+If you want to enable sign up through social providers like Facebook you will need to generate app credentials and store them in one of the following places:
+
+- In the Rails secrets file: `config/secrets.yml`. This configuration will be shared by all tenants.
+- In the site configuration (ex. system/organizations/1/edit). This configuration overrides the one in `config/secrets.yml`.
+
+Take into account that for a social provider integration appearing in the organization form, it must also be defined in `config/secrets.yml` (but the values are optional). For example:
+
+```yaml
+twitter:
+  enabled: false # disabled by default, unless activated in the organization
+  api_key:
+  api_secret:
+```
 
 ## Facebook
 
@@ -12,7 +24,7 @@ If you want to enable sign up through social providers like Facebook you will ne
 1. Validate the captcha.
 1. Ignore the source code and fill in the URL field with `https://YOUR_DECIDIM_HOST/users/auth/facebook/callback`
 1. Navigate to the application dashboard and copy the APP_ID and APP_SECRET
-1. Paste credentials in `config/secrets.yml`. Ensure the `enabled` attribute is `true`.
+1. Paste credentials in `config/secrets.yml` or in the organization configuration. Ensure the `enabled` attribute is `true`.
 
 ## Twitter
 
@@ -24,7 +36,7 @@ If you want to enable sign up through social providers like Facebook you will ne
 1. Check the 'Developer Agreement' checkbox and click the 'Create your Twitter application' button.
 1. Navigate to the "Keys and Access Tokens" tab and copy the API_KEY and API_SECRET.
 1. (Optional) Navigate to the "Permissions" tab and check the "Request email addresses from users" checkbox.
-1. Paste credentials in `config/secrets.yml`. Ensure the `enabled` attribute is `true`.
+1. Paste credentials in `config/secrets.yml` or in the organization configuration. Ensure the `enabled` attribute is `true`.
 
 ## Google
 
@@ -38,17 +50,17 @@ If you want to enable sign up through social providers like Facebook you will ne
 1. Click on `Credentials` tab and click on "Create credentials" button. Select `OAuth client ID`.
 1. Select `Web applications`. Fill in the `Authorized Javascript origins` with your url. Then fill in the `Authorized redirect URIs` with your url and append the path `/users/auth/google_oauth2/callback`.
 1. Copy the CLIENT_ID AND CLIENT_SECRET
-1. Paste credentials in `config/secrets.yml`. Ensure the `enabled` attribute is `true`.
+1. Paste credentials in `config/secrets.yml` or in the organization configuration. Ensure the `enabled` attribute is `true`.
 
 ## Custom providers
 
-* You can define your own provider, to allow users from other external applications to login into Decidim.
-* The provider should implement an [OmniAuth](https://github.com/omniauth/omniauth) strategy.
-* You can use any of the [existing OnmiAuth strategies](https://github.com/omniauth/omniauth/wiki/List-of-Strategies).
-* Or you can create a new strategy, as the [Decidim OmniAuth Strategy](https://github.com/decidim/omniauth-decidim). This strategy allow users from a Decidim instance to login in other Decidim instance. For example, this strategy is used to allow [decidim.barcelona](https://decidim.barcelona) users to log into [meta.decidim.barcelona](https://meta.decidim.barcelona).
-* Once you have defined your strategy, you can configure it in the `config/secrets.yml`, as it is done for the built-in providers.
-* By default, Decidim will search in its icons library for an icon named as the provider. You can change this adding an `icon` or `icon_path` attribute to the provider configuration. The `icon` attribute sets the icon name to look for in the Decidim's icons library. The `icon_path` attribute sets the route to the image that should be used.
-* Here is an example of the configuration section for the Decidim strategy, using an icon located on the application's `app/assets/images` folder:
+- You can define your own provider, to allow users from other external applications to login into Decidim.
+- The provider should implement an [OmniAuth](https://github.com/omniauth/omniauth) strategy.
+- You can use any of the [existing OnmiAuth strategies](https://github.com/omniauth/omniauth/wiki/List-of-Strategies).
+- Or you can create a new strategy, as the [Decidim OmniAuth Strategy](https://github.com/decidim/omniauth-decidim). This strategy allow users from a Decidim instance to login in other Decidim instance. For example, this strategy is used to allow [decidim.barcelona](https://decidim.barcelona) users to log into [meta.decidim.barcelona](https://meta.decidim.barcelona).
+- Once you have defined your strategy, you can configure it in the `config/secrets.yml` or in the organization configuration, as it is done for the built-in providers.
+- By default, Decidim will search in its icons library for an icon named as the provider. You can change this adding an `icon` or `icon_path` attribute to the provider configuration. The `icon` attribute sets the icon name to look for in the Decidim's icons library. The `icon_path` attribute sets the route to the image that should be used.
+- Here is an example of the configuration section for the Decidim strategy, using an icon located on the application's `app/assets/images` folder:
 
 ```yaml
     decidim:
@@ -58,3 +70,29 @@ If you want to enable sign up through social providers like Facebook you will ne
       site_url: <%= ENV["DECIDIM_SITE_URL"] %>
       icon_path: decidim-logo.svg
 ```
+
+- You will need a custom initializer for your provider in order to pass the proper params to the OmniaAuth Builder.
+
+An example of custom initializer could be written as:
+
+```ruby
+#config/initializers/omniauth_myprovider.rb
+if Rails.application.secrets.dig(:omniauth, :myprovider).present?
+  Rails.application.config.middleware.use OmniAuth::Builder do
+    provider(
+      :myprovider,
+      setup: ->(env) {
+          request = Rack::Request.new(env)
+          organization = Decidim::Organization.find_by(host: request.host)
+          provider_config = organization.enabled_omniauth_providers[:myprovider]
+          env["omniauth.strategy"].options[:client_id] = provider_config[:client_id]
+          env["omniauth.strategy"].options[:client_secret] = provider_config[:client_secret]
+          env["omniauth.strategy"].options[:site] = provider_config[:site_url]
+        },
+      scope: :public
+    )
+  end
+end
+```
+
+The custom provider may have different configuration options, instead of `client_id`, `client_secret` and `site`.

data/lib/decidim/gem_manager.rb

@@ -157,7 +157,7 @@ module Decidim
       end
 
       def semver_friendly_version
-        version.gsub(/\.pre/, "-pre").gsub(/\.dev/, "-dev")
+        version.gsub(/\.pre/, "-pre").gsub(/\.dev/, "-dev").gsub(/.rc(\d*)/, "-rc\\1")
       end
 
       def version_file

data/lib/decidim/version.rb

@@ -3,6 +3,6 @@
 # This holds the decidim version and the faker version it uses.
 module Decidim
   def self.version
-    "0.20.0"
+    "0.23.1.rc1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.23.1.rc1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-08 00:00:00.000000000 Z
+date: 2020-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-accountability
@@ -18,280 +18,280 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-blogs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-budgets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-debates
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-forms
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-generators
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-pages
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-sortitions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-surveys
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-system
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-verifications
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 2.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -335,18 +335,31 @@ files:
 - docs/advanced/activity_log.md
 - docs/advanced/add_authorizable_action.md
 - docs/advanced/adding_fixtures_aka_dummy_content.md
+- docs/advanced/api.md
 - docs/advanced/authorship.md
 - docs/advanced/components.md
 - docs/advanced/content_blocks.md
 - docs/advanced/content_processors.md
 - docs/advanced/data-picker.md
 - docs/advanced/deploy.md
+- docs/advanced/embeddable.md
+- docs/advanced/endorsable.md
+- docs/advanced/fixing_locales.md
 - docs/advanced/followers.md
 - docs/advanced/how_to_create_a_module.md
+- docs/advanced/how_to_fix_metrics.md
+- docs/advanced/machine_translation_service.md
 - docs/advanced/managing_translations_i18n.md
 - docs/advanced/metrics.md
 - docs/advanced/modules.md
+- docs/advanced/newsletter_templates.md
+- docs/advanced/notifications.md
 - docs/advanced/open-data.md
+- docs/advanced/permissions.md
+- docs/advanced/profiling.md
+- docs/advanced/releases.md
+- docs/advanced/share_tokens.md
+- docs/advanced/templates.md
 - docs/advanced/testing.md
 - docs/advanced/tradeoffs.md
 - docs/advanced/view_hooks.md
@@ -357,6 +370,8 @@ files:
 - docs/customization/gemfile.md
 - docs/customization/images.md
 - docs/customization/javascript.md
+- docs/customization/machine_translations.md
+- docs/customization/maps.md
 - docs/customization/oauth.md
 - docs/customization/styles.md
 - docs/customization/texts.md
@@ -368,8 +383,9 @@ files:
 - docs/possible_flows_for_proposal.png
 - docs/services/activejob.md
 - docs/services/analytics.md
+- docs/services/elections_bulletin_board.md
 - docs/services/etherpad.md
-- docs/services/geocoding.md
+- docs/services/maps.md
 - docs/services/social_providers.md
 - lib/decidim.rb
 - lib/decidim/gem_manager.rb
@@ -386,12 +402,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.3
 signing_key: