decidim 0.7.2 → 0.7.3

data/.decidim-version

@@ -1 +1 @@
-0.7.2
+0.7.3

data/.eslintignore

@@ -4,7 +4,6 @@ spec/decidim_dummy_app/**/*.js
 docker_development_app
 development_app
 **/node_modules/**
-vendor/bundle/**
 bundle.js
 karma.conf.js
 webpack.config.js

data/.gitignore

@@ -1,7 +1,6 @@
 spec/decidim_dummy_app/
 .byebug_history
 pkg/
-vendor/bundle
 */Gemfile.lock
 .DS_Store
 node_modules/

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## [v0.7.3](https://github.com/decidim/decidim/tree/v0.7.3) (2017-11-15)
+[Full Changelog](https://github.com/decidim/decidim/compare/v0.7.2...v0.7.3)
+
+**Fixed**:
+
+- **decidim-meetings**: Admins could not submit form after getting a validation error in the meeting registrations form [\2202](https://github.com/decidim/decidim/pull/2202)
+
 ## [v0.7.2](https://github.com/decidim/decidim/tree/v0.7.2) (2017-11-06)
 [Full Changelog](https://github.com/decidim/decidim/compare/v0.7.1...v0.7.2)
 

data/Dockerfile.ci

@@ -0,0 +1,28 @@
+ARG BASE_IMAGE_TAG=latest
+
+FROM codegram/decidim:$BASE_IMAGE_TAG
+MAINTAINER deivid.rodriguez@riseup.net
+
+USER root
+
+RUN apt-get update \
+  && apt-get install -y unzip
+
+RUN DOCKERIZE_URL="https://circle-downloads.s3.amazonaws.com/circleci-images/cache/linux-amd64/dockerize-latest.tar.gz" \
+  && curl --silent --show-error --location --fail --retry 3 --output /tmp/dockerize-linux-amd64.tar.gz $DOCKERIZE_URL \
+  && tar -C /usr/local/bin -xzvf /tmp/dockerize-linux-amd64.tar.gz \
+  && rm /tmp/dockerize-linux-amd64.tar.gz \
+  && dockerize --version
+
+RUN CHROME_URL="https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb" \
+  && curl --silent --show-error --location --fail --retry 3 --output /tmp/google-chrome-stable_current_amd64.deb $CHROME_URL \
+  && (dpkg -i /tmp/google-chrome-stable_current_amd64.deb || apt-get -fy install) \
+  && rm /tmp/google-chrome-stable_current_amd64.deb \
+  && google-chrome-stable --version
+
+RUN CHROMEDRIVER_RELEASE=$(curl --location --fail --retry 3 http://chromedriver.storage.googleapis.com/LATEST_RELEASE) \
+  && CHROMEDRIVER_URL="http://chromedriver.storage.googleapis.com/$CHROMEDRIVER_RELEASE/chromedriver_linux64.zip" \
+  && curl --silent --show-error --location --fail --retry 3 --output /tmp/chromedriver_linux64.zip $CHROMEDRIVER_URL \
+  && unzip /tmp/chromedriver_linux64.zip chromedriver -d /usr/local/bin \
+  && rm /tmp/chromedriver_linux64.zip \
+  && chromedriver --version

data/Gemfile

@@ -9,8 +9,6 @@ gem "decidim", path: "."
 # Uncomment the following line if you want to use decidim-assemblies plugin
 # gem "decidim-assemblies", path: "."
 
-gem "bootsnap", require: false
-
 gem "puma", "~> 3.0"
 gem "uglifier", ">= 1.3.0"
 

data/Gemfile.lock

@@ -1,27 +1,27 @@
 PATH
   remote: .
   specs:
-    decidim (0.7.2)
-      decidim-accountability (= 0.7.2)
-      decidim-admin (= 0.7.2)
-      decidim-api (= 0.7.2)
-      decidim-budgets (= 0.7.2)
-      decidim-comments (= 0.7.2)
-      decidim-core (= 0.7.2)
-      decidim-meetings (= 0.7.2)
-      decidim-pages (= 0.7.2)
-      decidim-participatory_processes (= 0.7.2)
-      decidim-proposals (= 0.7.2)
-      decidim-surveys (= 0.7.2)
-      decidim-system (= 0.7.2)
-    decidim-accountability (0.7.2)
-      decidim-comments (= 0.7.2)
-      decidim-core (= 0.7.2)
+    decidim (0.7.3)
+      decidim-accountability (= 0.7.3)
+      decidim-admin (= 0.7.3)
+      decidim-api (= 0.7.3)
+      decidim-budgets (= 0.7.3)
+      decidim-comments (= 0.7.3)
+      decidim-core (= 0.7.3)
+      decidim-meetings (= 0.7.3)
+      decidim-pages (= 0.7.3)
+      decidim-participatory_processes (= 0.7.3)
+      decidim-proposals (= 0.7.3)
+      decidim-surveys (= 0.7.3)
+      decidim-system (= 0.7.3)
+    decidim-accountability (0.7.3)
+      decidim-comments (= 0.7.3)
+      decidim-core (= 0.7.3)
       kaminari (~> 1.0.1)
       searchlight (~> 4.1.0)
-    decidim-admin (0.7.2)
+    decidim-admin (0.7.3)
       active_link_to (~> 1.0.0)
-      decidim-core (= 0.7.2)
+      decidim-core (= 0.7.3)
       devise (~> 4.2)
       devise-i18n (~> 1.2.0)
       devise_invitable (~> 1.7.0)
@@ -29,26 +29,26 @@ PATH
       jquery-rails (~> 4.3.1)
       sassc-rails (~> 1.3.0)
       select2-rails (~> 4.0.3)
-    decidim-api (0.7.2)
+    decidim-api (0.7.3)
       graphiql-rails (~> 1.4.2, < 1.4.5)
       graphql (~> 1.6.0)
       rack-cors (~> 1.0.1)
       sprockets-es6 (~> 0.9.2)
-    decidim-budgets (0.7.2)
-      decidim-comments (= 0.7.2)
-      decidim-core (= 0.7.2)
+    decidim-budgets (0.7.3)
+      decidim-comments (= 0.7.3)
+      decidim-core (= 0.7.3)
       kaminari (~> 1.0.1)
       searchlight (~> 4.1.0)
-    decidim-comments (0.7.2)
-      decidim-core (= 0.7.2)
+    decidim-comments (0.7.3)
+      decidim-core (= 0.7.3)
       jquery-rails (~> 4.0)
-    decidim-core (0.7.2)
+    decidim-core (0.7.3)
       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.7.2)
+      decidim-api (= 0.7.3)
       devise (~> 4.3)
       devise-i18n (~> 1.2.0)
       file_validators (~> 2.1.0)
@@ -76,51 +76,51 @@ PATH
       sprockets-es6 (~> 0.9.2)
       truncato (~> 0.7.10)
       wisper (~> 2.0.0)
-    decidim-dev (0.7.2)
+    decidim-dev (0.7.3)
       byebug
       capybara (~> 2.15)
       capybara-screenshot (~> 1.0)
       codecov (~> 0.1.9)
       database_cleaner (~> 1.6)
       db-query-matchers (~> 0.9.0)
-      decidim (= 0.7.2)
+      decidim (= 0.7.3)
       factory_girl_rails
       i18n-tasks (= 0.9.18)
       listen (~> 3.1)
       nokogiri (~> 1.8)
-      poltergeist (~> 1.16)
       puma (~> 3.10)
       rails-controller-testing (~> 1.0)
       rspec-html-matchers (~> 0.9.1)
       rspec-rails (~> 3.6)
       rspec-repeat (~> 1.0)
-      rubocop (~> 0.50.0)
+      rubocop (~> 0.51.0)
+      selenium-webdriver (~> 3.7)
       simplecov (~> 0.13)
       webmock (~> 3.0)
       wisper-rspec (~> 0.0.3)
-    decidim-meetings (0.7.2)
+    decidim-meetings (0.7.3)
       date_validator (~> 0.9)
-      decidim-core (= 0.7.2)
+      decidim-core (= 0.7.3)
       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.7.2)
-      decidim-core (= 0.7.2)
-    decidim-participatory_processes (0.7.2)
-      decidim-core (= 0.7.2)
-    decidim-proposals (0.7.2)
-      decidim-comments (= 0.7.2)
-      decidim-core (= 0.7.2)
+    decidim-pages (0.7.3)
+      decidim-core (= 0.7.3)
+    decidim-participatory_processes (0.7.3)
+      decidim-core (= 0.7.3)
+    decidim-proposals (0.7.3)
+      decidim-comments (= 0.7.3)
+      decidim-core (= 0.7.3)
       kaminari (~> 1.0.1)
       social-share-button (~> 1.0.0)
-    decidim-surveys (0.7.2)
-      decidim-core (= 0.7.2)
+    decidim-surveys (0.7.3)
+      decidim-core (= 0.7.3)
       jquery-tmpl-rails (~> 1.1.0)
-    decidim-system (0.7.2)
+    decidim-system (0.7.3)
       active_link_to (~> 1.0.0)
-      decidim-core (= 0.7.2)
+      decidim-core (= 0.7.3)
       devise (~> 4.2)
       devise-i18n (~> 1.2.0)
       devise_invitable (~> 1.7.1)
@@ -187,26 +187,25 @@ GEM
       execjs (~> 2.0)
     bcrypt (3.1.11)
     bindex (0.5.0)
-    bootsnap (1.1.3)
-      msgpack (~> 1.0)
     builder (3.2.3)
     byebug (9.1.0)
     cancancan (2.0.0)
-    capybara (2.15.4)
+    capybara (2.16.0)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    capybara-screenshot (1.0.17)
+    capybara-screenshot (1.0.18)
       capybara (>= 1.0, < 3)
       launchy
     carrierwave (1.1.0)
       activemodel (>= 4.0.0)
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
-    cliver (0.3.2)
+    childprocess (0.8.0)
+      ffi (~> 1.0, >= 1.0.11)
     codecov (0.1.10)
       json
       simplecov
@@ -347,10 +346,9 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_magick (4.8.0)
-    mini_mime (0.1.4)
+    mini_mime (1.0.0)
     mini_portile2 (2.3.0)
     minitest (5.10.3)
-    msgpack (1.1.0)
     multi_json (1.12.2)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
@@ -385,15 +383,11 @@ GEM
       rack
     orm_adapter (0.5.0)
     parallel (1.12.0)
-    parser (2.4.0.0)
-      ast (~> 2.2)
+    parser (2.4.0.2)
+      ast (~> 2.3)
     pg (0.21.0)
-    poltergeist (1.16.0)
-      capybara (~> 2.1)
-      cliver (~> 0.3.1)
-      websocket-driver (>= 0.2.0)
     powerpack (0.1.1)
-    premailer (1.11.0)
+    premailer (1.11.1)
       addressable
       css_parser (>= 1.6.0)
       htmlentities (>= 4.0.0)
@@ -505,6 +499,9 @@ GEM
     searchlight (4.1.0)
     select2-rails (4.0.3)
       thor (~> 0.14)
+    selenium-webdriver (3.7.0)
+      childprocess (~> 0.5)
+      rubyzip (~> 1.0)
     simplecov (0.15.1)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
@@ -563,7 +560,7 @@ GEM
       hashdiff
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
+    websocket-extensions (0.1.3)
     wisper (2.0.0)
     wisper-rspec (0.0.3)
     xpath (2.1.0)
@@ -573,7 +570,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bootsnap
   byebug
   decidim!
   decidim-dev!
@@ -590,4 +586,4 @@ RUBY VERSION
    ruby 2.4.2p198
 
 BUNDLED WITH
-   1.15.4
+   1.16.0

data/README.md

@@ -65,7 +65,11 @@ In order to develop on decidim, you'll need:
 * **Ruby** 2.4.1
 * **NodeJS** 8.x.x
 * **ImageMagick**
+<<<<<<< HEAD
 * **PhantomJS**
+=======
+* **Chrome** browser and [chromedriver](https://sites.google.com/a/chromium.org/chromedriver/).
+>>>>>>> 898adf74b... Migrate to headless chrome (#2157)
 
 The easiest way to work on decidim is to clone decidim's repository and install its dependencies
 

data/docker-compose.yml

@@ -1,10 +1,12 @@
 version: '2'
 services:
   decidim:
-    build: '.'
-    working_dir: /code
+    image: decidim/decidim:dev-latest
+    entrypoint: []
+    command: decidim
     volumes:
-      - .:/code
+      - .:/app
+      - bundle:/usr/local/bundle
     environment:
       - DATABASE_HOST=pg
       - DATABASE_USERNAME=postgres
@@ -20,5 +22,6 @@ services:
     volumes:
       - redis-data:/data
 volumes:
+  bundle: {}
   pg-data: {}
   redis-data: {}

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.7.2"
+    "0.7.3"
   end
 end

data/lib/generators/decidim/app_generator.rb

@@ -97,10 +97,6 @@ module Decidim
         run "bundle install"
       end
 
-      def bootsnap
-        append_file "config/boot.rb", "require 'bootsnap/setup'\n"
-      end
-
       def add_ignore_uploads
         unless options["skip_git"]
           append_file ".gitignore", "\n# Ignore public uploads\npublic/uploads"

data/lib/generators/decidim/templates/Dockerfile.erb

@@ -1,26 +1 @@
-FROM ruby:<%= RUBY_VERSION %>
-MAINTAINER david.morcillo@codegram.com
-
-ARG rails_env=production
-ARG secret_key_base=
-
-ENV APP_HOME /code
-ENV RAILS_ENV $rails_env
-ENV SECRET_KEY_BASE $secret_key_base
-
-RUN apt-get update
-
-RUN curl -sL https://deb.nodesource.com/setup_8.x | bash && \
-    apt-get install -y nodejs
-
-ADD Gemfile /tmp/Gemfile
-ADD Gemfile.lock /tmp/Gemfile.lock
-RUN cd /tmp && bundle install
-
-RUN mkdir -p $APP_HOME
-WORKDIR $APP_HOME
-ADD . $APP_HOME
-
-RUN bundle exec rake DATABASE_URL=postgresql://user:pass@127.0.0.1/dbname assets:precompile
-
-CMD ["bundle", "exec", "rails", "s", "-b0.0.0.0"]
+FROM decidim/decidim

data/lib/generators/decidim/templates/docker-compose.yml.erb

@@ -1,20 +1,37 @@
 version: '2'
 services:
   app:
-    build:
-      context: .
-      args:
-        rails_env: development
+    image: decidim/decidim:0.7.2-dev 
     volumes:
-      - .:/code
+      - .:/app
+      - bundle:/usr/local/bundle
+      - node_modules:/app/node_modules
     environment:
+      - PORT=3000
       - DATABASE_HOST=pg
       - DATABASE_USERNAME=postgres
+      - RAILS_ENV=development
+      - REDIS_URL=redis://redis:6379
     ports:
       - 3000:3000
     links:
       - pg
       - redis
+    command: bundle exec puma
+  worker:
+    image: decidim/decidim:latest-dev
+    volumes:
+      - .:/app
+      - bundle:/usr/local/bundle
+    environment:
+      - DATABASE_HOST=pg
+      - DATABASE_USERNAME=postgres
+      - RAILS_ENV=development
+      - REDIS_URL=redis://redis:6379
+    links:
+      - pg
+      - redis
+    command: bundle exec sidekiq
   pg:
     image: postgres
     volumes:
@@ -24,5 +41,7 @@ services:
     volumes:
       - redis-data:/data
 volumes:
+  node_modules: {}
+  bundle: {}
   pg-data: {}
   redis-data: {}