From a7fce677fc7d4be44f62914e162ae494f0228f9e Mon Sep 17 00:00:00 2001
From: James Mason <jmason@suse.com>
Date: Fri, 3 Nov 2017 17:41:26 -0700
Subject: [PATCH 01/26] Add reCAPTCHA support to registration.

Because I *hate* spam bots.
---
 Gemfile                                      |  3 ++
 Gemfile.lock                                 |  3 ++
 app/assets/stylesheets/osem.css.scss         | 11 ++++++
 app/controllers/registrations_controller.rb  | 39 +++++++++++++++-----
 app/views/devise/registrations/new.html.haml |  1 +
 dotenv.example                               |  4 ++
 6 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/Gemfile b/Gemfile
index 22dc5f6e..dcb05938 100644
--- a/Gemfile
+++ b/Gemfile
@@ -44,6 +44,9 @@ gem 'omniauth-openid'
 gem 'omniauth-google-oauth2'
 gem 'omniauth-github'
 
+# Bot-filtering
+gem 'recaptcha', require: 'recaptcha/rails'
+
 # as authorization framework
 gem 'cancancan'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index dc730e82..454dfa6a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -420,6 +420,8 @@ GEM
       loggability (~> 0.12)
       rdoc (~> 5.0)
       yajl-ruby (~> 1.3)
+    recaptcha (4.6.2)
+      json
     redcarpet (3.2.3)
     referer-parser (0.2.1)
     request_store (1.1.0)
@@ -636,6 +638,7 @@ DEPENDENCIES
   rails-i18n (~> 4.0.0)
   rails_12factor
   rdoc-generator-fivefish
+  recaptcha
   redcarpet
   responders (~> 2.0)
   rolify
diff --git a/app/assets/stylesheets/osem.css.scss b/app/assets/stylesheets/osem.css.scss
index 79768c5d..bbcabc44 100644
--- a/app/assets/stylesheets/osem.css.scss
+++ b/app/assets/stylesheets/osem.css.scss
@@ -1,3 +1,5 @@
+@import "bootstrap/mixins";
+
 html {
   position: relative;
   min-height: 100%;
@@ -104,3 +106,12 @@ p.comment-body {
 .qr-image{
   margin-left: 120px;
 }
+
+.g-recaptcha {
+    @include clearfix;
+    padding-bottom: 12px;
+    
+    div {
+        float: right;
+    }
+}
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index e141084c..a133ceaf 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -1,5 +1,5 @@
 class RegistrationsController < Devise::RegistrationsController
-  before_action :configure_permitted_parameters, if: :devise_controller?
+  prepend_before_action :check_captcha, only: [:create]
 
   def edit
     @openids = Openid.where(user_id: current_user.id).order(:provider)
@@ -21,14 +21,35 @@ class RegistrationsController < Devise::RegistrationsController
     edit_user_registration_path(resource)
   end
 
-  def configure_permitted_parameters
-    devise_parameter_sanitizer.permit(:account_update) do |u|
-      u
-          .permit(:email, :password, :password_confirmation, :current_password, :username, :email_public)
-    end
-    devise_parameter_sanitizer.permit(:sign_up) do |u|
-      u
-          .permit(:email, :password, :password_confirmation, :name, :username)
+  private
+
+  def sign_up_params
+    params.require(:user).permit(
+      :email,
+      :password,
+      :password_confirmation,
+      :name,
+      :username
+    )
+  end
+
+  def account_update_params
+    params.require(:user).permit(
+      :email,
+      :password,
+      :password_confirmation,
+      :current_password,
+      :username,
+      :email_public
+    )
+  end
+
+  def check_captcha
+    unless verify_recaptcha
+      self.resource = resource_class.new sign_up_params
+      resource.validate # Look for any other validation errors besides Recaptcha
+      respond_with_navigational(resource) { render :new }
     end
   end
+
 end
diff --git a/app/views/devise/registrations/new.html.haml b/app/views/devise/registrations/new.html.haml
index aa9c4db4..e63eb19e 100644
--- a/app/views/devise/registrations/new.html.haml
+++ b/app/views/devise/registrations/new.html.haml
@@ -12,6 +12,7 @@
             = f.input :name, input_html: { required: true }, hint: 'This is your real name'
             = f.input :password, input_html: { required: true }
             = f.input :password_confirmation, input_html: { required: true }
+            = recaptcha_tags
             %p.text-right
               = f.action :submit, as: :button, label: 'Sign Up', button_html: { class: 'btn btn-success' }
 
diff --git a/dotenv.example b/dotenv.example
index 77c28e4c..2c5c0b94 100644
--- a/dotenv.example
+++ b/dotenv.example
@@ -63,3 +63,7 @@ OSEM_SMTP_OPENSSL_VERIFY_MODE=""
 
 # Enable the usage of the devise ichain plugin
 OSEM_ICHAIN_ENABLED=false
+
+# ReCAPTCHA keys
+RECAPTCHA_SITE_KEY=""
+RECAPTCHA_SECRET_KEY=""

From 0aa782711dde4319e0757bd7f13455f1f2b64372 Mon Sep 17 00:00:00 2001
From: James Mason <jmason@suse.com>
Date: Fri, 3 Nov 2017 20:37:42 -0700
Subject: [PATCH 02/26] Use 'Feature's to toggle optional functionality

TODO: Wrap every incomplete project in a feature, and _turn it off_.
---
 Gemfile                                      |  4 ++++
 Gemfile.lock                                 |  2 ++
 app/controllers/registrations_controller.rb  |  3 +--
 app/views/devise/registrations/new.html.haml |  3 ++-
 config/initializers/feature.rb               | 10 ++++++++++
 5 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 config/initializers/feature.rb

diff --git a/Gemfile b/Gemfile
index dcb05938..3ec566ea 100644
--- a/Gemfile
+++ b/Gemfile
@@ -185,6 +185,10 @@ gem 'cloudinary'
 # for setting app configuration in the environment
 gem 'dotenv-rails'
 
+# configurable toggles for functionality
+# https://github.com/mgsnova/feature
+gem 'feature'
+
 # For countable.js
 gem "countable-rails", "~> 0.0.1"
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 454dfa6a..bad063c8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -179,6 +179,7 @@ GEM
       multipart-post (>= 1.2, < 3)
     fastimage (2.0.0)
       addressable (~> 2)
+    feature (1.4.0)
     ffi (1.9.18)
     font-awesome-rails (4.7.0.2)
       railties (>= 3.2, < 5.2)
@@ -591,6 +592,7 @@ DEPENDENCIES
   dotenv-rails
   factory_girl_rails
   faker
+  feature
   font-awesome-rails
   formtastic (~> 3.1.1)
   formtastic-bootstrap
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index a133ceaf..e020d217 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -45,11 +45,10 @@ class RegistrationsController < Devise::RegistrationsController
   end
 
   def check_captcha
-    unless verify_recaptcha
+    unless Feature.inactive?(:recaptcha) || verify_recaptcha
       self.resource = resource_class.new sign_up_params
       resource.validate # Look for any other validation errors besides Recaptcha
       respond_with_navigational(resource) { render :new }
     end
   end
-
 end
diff --git a/app/views/devise/registrations/new.html.haml b/app/views/devise/registrations/new.html.haml
index e63eb19e..64aaa99e 100644
--- a/app/views/devise/registrations/new.html.haml
+++ b/app/views/devise/registrations/new.html.haml
@@ -12,7 +12,8 @@
             = f.input :name, input_html: { required: true }, hint: 'This is your real name'
             = f.input :password, input_html: { required: true }
             = f.input :password_confirmation, input_html: { required: true }
-            = recaptcha_tags
+            - Feature.with(:recaptcha) do
+              = recaptcha_tags
             %p.text-right
               = f.action :submit, as: :button, label: 'Sign Up', button_html: { class: 'btn btn-success' }
 
diff --git a/config/initializers/feature.rb b/config/initializers/feature.rb
new file mode 100644
index 00000000..415d84f7
--- /dev/null
+++ b/config/initializers/feature.rb
@@ -0,0 +1,10 @@
+require 'feature'
+
+repo = Feature::Repository::SimpleRepository.new
+
+# configure features here
+unless(ENV['RECAPTCHA_SITE_KEY'].blank? || ENV['RECAPTCHA_SECRET_KEY'].blank?)
+  repo.add_active_feature :recaptcha
+end
+
+Feature.set_repository repo

From 02709597a284e8b83c4ed67a1d01f774343d82e1 Mon Sep 17 00:00:00 2001
From: Adriano Vieira <adriano.svieira@gmail.com>
Date: Sat, 4 Nov 2017 22:13:19 -0200
Subject: [PATCH 03/26] Update bootstrap for centos box

---
 bootstrap.sh | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/bootstrap.sh b/bootstrap.sh
index 92a8d746..f65ba6e2 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,4 +1,10 @@
 #!/bin/bash
+
+# set env os release variables
+. /etc/os-release
+
+if [[ "$ID" == "opensuse" ]]; then
+
 pushd /vagrant
 
 echo -e "\ninstalling required software packages...\n"
@@ -14,6 +20,37 @@ echo 'install: --no-format-executable' >> /etc/gemrc
 echo -e "\ninstalling bundler...\n"
 gem.ruby2.4 install bundler
 
+elif [[ "$ID" == "centos" || "$VERSION" == "7"  ]]; then
+  _YELLOW='\033[1;33m' # yellow color
+  _LRED='\033[1;31m' # Light red color
+  _NO_COLOUR='\033[0m' # no color
+
+  printf "${_YELLOW}CEntOS-7 Setup${_NO_COLOUR}\n"
+
+  printf "${_YELLOW}installing ruby-2.4${_NO_COLOUR}\n"
+  yum install -q -y https://github.com/feedforce/ruby-rpm/releases/download/2.4.2/ruby-2.4.2-1.el7.centos.x86_64.rpm
+  if [[ ! "$?" -eq 0 ]]; then
+    printf "${_LRED}Error trying to install ruby-2.4${_NO_COLOUR}\n"
+  fi
+
+  printf "${_YELLOW}installing ruby-2.4 gems dependencies${_NO_COLOUR}\n"
+  gem install bundler
+  if [[ ! "$?" -eq 0 ]]; then
+    printf "${_LRED}Error trying to install ruby-2.4 bundler${_NO_COLOUR}\n"
+  fi
+
+  printf "${_YELLOW}installing nodejs repo${_NO_COLOUR}\n"
+  curl -sL https://rpm.nodesource.com/setup_9.x | bash - > /dev/null
+
+  printf "${_YELLOW}installing nodejs and devel tools${_NO_COLOUR}\n"
+  yum install -q -y git make gcc gcc-c++ libxml2-devel libxslt-devel nodejs screen mariadb mariadb-devel sqlite-devel ImageMagick
+
+  # for production: bundle install --without test development
+  printf "${_YELLOW}Opening firewall port: 3000${_NO_COLOUR}\n"
+  iptables -I INPUT -p tcp --dport 3000 -j ACCEPT
+
+fi
+
 echo -e "\ninstalling your bundle...\n"
 su - vagrant -c "cd /vagrant/; bundle install --quiet"
 

From c4fad4a181b1f10e961b342ff42c8a96933a008d Mon Sep 17 00:00:00 2001
From: Adriano Vieira <adriano.svieira@gmail.com>
Date: Sun, 5 Nov 2017 00:55:07 -0200
Subject: [PATCH 04/26] Update bootstrap to install phantomjs on centos

---
 bootstrap.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index f65ba6e2..06a642dd 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -43,12 +43,17 @@ elif [[ "$ID" == "centos" || "$VERSION" == "7"  ]]; then
   curl -sL https://rpm.nodesource.com/setup_9.x | bash - > /dev/null
 
   printf "${_YELLOW}installing nodejs and devel tools${_NO_COLOUR}\n"
-  yum install -q -y git make gcc gcc-c++ libxml2-devel libxslt-devel nodejs screen mariadb mariadb-devel sqlite-devel ImageMagick
+  yum install -q -y git make gcc gcc-c++ libxml2-devel libxslt-devel nodejs screen mariadb mariadb-devel sqlite-devel ImageMagick bzip2
 
   # for production: bundle install --without test development
   printf "${_YELLOW}Opening firewall port: 3000${_NO_COLOUR}\n"
   iptables -I INPUT -p tcp --dport 3000 -j ACCEPT
 
+  printf "${_YELLOW}installing phantomjs${_NO_COLOUR}\n"
+  curl -L --silent https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2 -o /tmp/phantomjs-2.1.1-linux-x86_64.tar.bz2
+  tar jxvf /tmp/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C /tmp/  phantomjs-2.1.1-linux-x86_64/bin/phantomjs
+  mv /tmp/phantomjs-2.1.1-linux-x86_64/bin/phantomjs /usr/local/bin
+
 fi
 
 echo -e "\ninstalling your bundle...\n"

From 7c0fa59a0a37d6950496ac1dc16906bdd51225dc Mon Sep 17 00:00:00 2001
From: Your Name <01namangupta@gmail.com>
Date: Thu, 12 Oct 2017 23:51:58 +0530
Subject: [PATCH 05/26] Speaker emails in Events CSV/XLS export is included

---
 app/models/event.rb                             |  9 +++++++++
 app/views/admin/events/_all_events.csv.haml     | 14 +++++++++++---
 app/views/admin/events/_all_events.xlsx.axlsx   | 14 +++++++++++++-
 .../admin/events/_all_with_comments.csv.haml    | 16 +++++++++++++---
 .../admin/events/_all_with_comments.xlsx.axlsx  | 17 +++++++++++++++--
 .../admin/events/_confirmed_events.csv.haml     | 14 +++++++++++---
 .../admin/events/_confirmed_events.xlsx.axlsx   | 14 +++++++++++++-
 7 files changed, 85 insertions(+), 13 deletions(-)

diff --git a/app/models/event.rb b/app/models/event.rb
index c6de2d45..52c6f106 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -211,6 +211,15 @@ class Event < ActiveRecord::Base
     result.to_a.to_sentence
   end
 
+  # Returns emails of all the speaker belongs to a particular event
+  def speaker_emails
+    result = Array.new
+    speakers.each do |speaker|
+      result << speaker.email
+    end
+    result.to_sentence
+  end
+
   ##
   #
   # Returns +Hash+
diff --git a/app/views/admin/events/_all_events.csv.haml b/app/views/admin/events/_all_events.csv.haml
index 9423c4ee..c7bff3be 100644
--- a/app/views/admin/events/_all_events.csv.haml
+++ b/app/views/admin/events/_all_events.csv.haml
@@ -4,6 +4,7 @@
              'Start time',
              'Submitter',
              'Speaker',
+             'Speaker Email',
              'Event Type',
              'Track',
              'Difficulty Level',
@@ -12,8 +13,15 @@
 = CSV.generate_line ['All Events']
 = CSV.generate_line headers
 - @events.each do |event|
-  = CSV.generate_line([event.id, event.title, event.abstract, (event.time.present? ? "#{event.time.strftime("%Y-%m-%d")} #{event.time.strftime("%I:%M%p")} " : ''),
-                       event.submitter.name, event.speaker_names, event.event_type.title,
+  = CSV.generate_line([event.id,
+                       event.title,
+                       event.abstract,
+                       (event.time.present? ? "#{event.time.strftime("%Y-%m-%d")}#{event.time.strftime("%I:%M%p")} " : ''),
+                       event.submitter.name,
+                       event.speaker_names,
+                       event.speaker_emails,
+                       event.event_type.title,
                        (event.track.present? ? event.track.name : ''),
                        (event.difficulty_level.present? ? event.difficulty_level.title : ''),
-                       (event.room.present? ? event.room.name : ''), event.state]).html_safe
+                       (event.room.present? ? event.room.name : ''),
+                       event.state]).html_safe
diff --git a/app/views/admin/events/_all_events.xlsx.axlsx b/app/views/admin/events/_all_events.xlsx.axlsx
index 66232784..2391e6dc 100644
--- a/app/views/admin/events/_all_events.xlsx.axlsx
+++ b/app/views/admin/events/_all_events.xlsx.axlsx
@@ -1,6 +1,17 @@
 wb.add_worksheet(name: 'all events') do |sheet|
   bold_style = wb.styles.add_style(b: true)
-  row = ['Event ID', 'Title', 'Abstract', 'Start time', 'Submitter', 'Speaker', 'Event Type', 'Track', 'Difficulty Level', 'Room', 'State']
+  row = ['Event ID',
+         'Title',
+         'Abstract',
+         'Start time',
+         'Submitter',
+         'Speaker',
+         'Speaker Email',
+         'Event Type',
+         'Track',
+         'Difficulty Level',
+         'Room',
+         'State']
   sheet.add_row row, style: bold_style
 
   @events.each do |event|
@@ -11,6 +22,7 @@ wb.add_worksheet(name: 'all events') do |sheet|
     row << (event.time.present? ? "#{event.time.strftime("%Y-%m-%d")} #{event.time.strftime("%I:%M%p")} " : '')
     row << event.submitter.name
     row << event.speaker_names
+    row << event.speaker_emails
     row << event.event_type.title
     row << (event.track.present? ? event.track.name : '')
     row << (event.difficulty_level.present? ? event.difficulty_level.title : '')
diff --git a/app/views/admin/events/_all_with_comments.csv.haml b/app/views/admin/events/_all_with_comments.csv.haml
index cdf79339..315da41e 100644
--- a/app/views/admin/events/_all_with_comments.csv.haml
+++ b/app/views/admin/events/_all_with_comments.csv.haml
@@ -4,6 +4,7 @@
              'Start time',
              'Submitter',
              'Speaker',
+             'Speaker Email',
              'Event Type',
              'Track',
              'Difficulty Level',
@@ -16,8 +17,17 @@
   - all_comments = ''
   - event.root_comments.each do |comment|
     - all_comments << "#{comment.created_at.strftime("%Y-%m-%d")} #{comment.created_at.strftime("%I:%M%p")}  #{comment.user.name}: #{comment.body}\n"
-  = CSV.generate_line([event.id, event.title, event.abstract, (event.time.present? ? "#{event.time.strftime("%Y-%m-%d")} #{event.time.strftime("%I:%M%p")} " : ''),
-                       event.submitter.name, event.speaker_names, event.event_type.title,
+  = CSV.generate_line([event.id,
+                       event.title,
+                       event.abstract,
+                       (event.time.present? ? "#{event.time.strftime("%Y-%m-%d")}#{event.time.strftime("%I:%M%p")} " : ''),
+                       event.submitter.name,
+                       event.speaker_names,
+                       event.speaker_emails,
+                       event.event_type.title,
                        (event.track.present? ? event.track.name : ''),
                        (event.difficulty_level.present? ? event.difficulty_level.title : ''),
-                       (event.room.present? ? event.room.name : ''), event.state, all_comments]).html_safe
+                       (event.room.present? ? event.room.name : ''),
+                       event.state,
+                       all_comments]).html_safe
+
diff --git a/app/views/admin/events/_all_with_comments.xlsx.axlsx b/app/views/admin/events/_all_with_comments.xlsx.axlsx
index 038dfea5..9a9e8c71 100644
--- a/app/views/admin/events/_all_with_comments.xlsx.axlsx
+++ b/app/views/admin/events/_all_with_comments.xlsx.axlsx
@@ -1,8 +1,20 @@
 wb.use_shared_strings = true
 wb.add_worksheet(name: 'events with comments') do |sheet|
-  bold_style = wb.styles.add_style(b: true )
+  bold_style = wb.styles.add_style( b: true )
   cell_style = wb.styles.add_style(alignment: { wrap_text: true, vertical: :top })
-row = ['Event ID', 'Title', 'Abstract', 'Start time', 'Submitter', 'Speaker', 'Event Type', 'Track', 'Difficulty Level', 'Room', 'State', 'Comments']
+  row = ['Event ID',
+         'Title',
+         'Abstract',
+         'Start time',
+         'Submitter',
+         'Speaker',
+         'Speaker Email',
+         'Event Type',
+         'Track',
+         'Difficulty Level',
+         'Room',
+         'State',
+         'Comments']
   sheet.add_row row, style: bold_style
 
   @events.each do |event|
@@ -17,6 +29,7 @@ row = ['Event ID', 'Title', 'Abstract', 'Start time', 'Submitter', 'Speaker', 'E
     row << (event.time.present? ? "#{event.time.strftime("%Y-%m-%d")} #{event.time.strftime("%I:%M%p")} " : '')
     row << event.submitter.name
     row << event.speaker_names
+    row << event.speaker_emails
     row << event.event_type.title
     row << (event.track.present? ? event.track.name : '')
     row << (event.difficulty_level.present? ? event.difficulty_level.title : '')
diff --git a/app/views/admin/events/_confirmed_events.csv.haml b/app/views/admin/events/_confirmed_events.csv.haml
index 4edbbaa3..2a61c352 100644
--- a/app/views/admin/events/_confirmed_events.csv.haml
+++ b/app/views/admin/events/_confirmed_events.csv.haml
@@ -4,6 +4,7 @@
              'Start time',
              'Submitter',
              'Speaker',
+             'Speaker Email',
              'Event Type',
              'Track',
              'Difficulty Level',
@@ -12,8 +13,15 @@
 = CSV.generate_line ["Confirmed Events"]
 = CSV.generate_line headers
 - @events.confirmed.each do |event|
-  = CSV.generate_line([event.id, event.title, event.abstract, (event.time.present? ? "#{event.time.strftime("%Y-%m-%d")} #{event.time.strftime("%I:%M%p")} " : ''),
-                       event.submitter.name, event.speaker_names, event.event_type.title,
+  = CSV.generate_line([event.id,
+                       event.title,
+                       event.abstract,
+                       (event.time.present? ? "#{event.time.strftime("%Y-%m-%d")} #{event.time.strftime("%I:%M%p")} " : ''),
+                       event.submitter.name,
+                       event.speaker_names,
+                       event.speaker_emails,
+                       event.event_type.title,
                        (event.track.present? ? event.track.name : ''),
                        (event.difficulty_level.present? ? event.difficulty_level.title : ''),
-                       (event.room.present? ? event.room.name : ''), event.state]).html_safe
+                       (event.room.present? ? event.room.name : ''),
+                       event.state]).html_safe
diff --git a/app/views/admin/events/_confirmed_events.xlsx.axlsx b/app/views/admin/events/_confirmed_events.xlsx.axlsx
index 34c40b36..3d1067f6 100644
--- a/app/views/admin/events/_confirmed_events.xlsx.axlsx
+++ b/app/views/admin/events/_confirmed_events.xlsx.axlsx
@@ -1,6 +1,17 @@
 wb.add_worksheet(name: 'confirmed events') do |sheet|
   bold_style = wb.styles.add_style(b: true)
-  row = ['Event ID', 'Title', 'Abstract', 'Start time', 'Submitter', 'Speaker', 'Event Type', 'Track', 'Difficulty Level', 'Room', 'State']
+  row = ['Event ID',
+         'Title',
+         'Abstract',
+         'Start time',
+         'Submitter',
+         'Speaker',
+         'Speaker Email',
+         'Event Type',
+         'Track',
+         'Difficulty Level',
+         'Room',
+         'State']
   sheet.add_row row, style: bold_style
 
   @events.confirmed.each do |event|
@@ -11,6 +22,7 @@ wb.add_worksheet(name: 'confirmed events') do |sheet|
     row << (event.time.present? ? "#{event.time.strftime("%Y-%m-%d")} #{event.time.strftime("%I:%M%p")} " : '')
     row << event.submitter.name
     row << event.speaker_names
+    row << event.speaker_emails
     row << event.event_type.title
     row << (event.track.present? ? event.track.name : '')
     row << (event.difficulty_level.present? ? event.difficulty_level.title : '')

From 5b7aa56f6b2b7a3046615a85194a9d9aff4b653f Mon Sep 17 00:00:00 2001
From: Your Name <01namangupta@gmail.com>
Date: Fri, 13 Oct 2017 16:08:33 +0530
Subject: [PATCH 06/26] minor changes

---
 app/models/event.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/event.rb b/app/models/event.rb
index 52c6f106..472130e3 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -213,7 +213,7 @@ class Event < ActiveRecord::Base
 
   # Returns emails of all the speaker belongs to a particular event
   def speaker_emails
-    result = Array.new
+    result = []
     speakers.each do |speaker|
       result << speaker.email
     end

From 52a5cb2391739155ca0f176f25f5a5d9e5e2e546 Mon Sep 17 00:00:00 2001
From: Your Name <01namangupta@gmail.com>
Date: Fri, 13 Oct 2017 23:33:43 +0530
Subject: [PATCH 07/26] speakers email field is added to pdf

---
 app/models/event.rb                                  | 6 +-----
 app/views/admin/events/_all_events.pdf.prawn         | 2 ++
 app/views/admin/events/_all_with_comments.pdf.prawn  | 2 ++
 app/views/admin/events/_all_with_comments.xlsx.axlsx | 2 +-
 app/views/admin/events/_confirmed_events.pdf.prawn   | 2 ++
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/models/event.rb b/app/models/event.rb
index 472130e3..2d18db1e 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -213,11 +213,7 @@ class Event < ActiveRecord::Base
 
   # Returns emails of all the speaker belongs to a particular event
   def speaker_emails
-    result = []
-    speakers.each do |speaker|
-      result << speaker.email
-    end
-    result.to_sentence
+    speakers.map(&:email).join(', ')
   end
 
   ##
diff --git a/app/views/admin/events/_all_events.pdf.prawn b/app/views/admin/events/_all_events.pdf.prawn
index e53a1018..f13d4a8e 100644
--- a/app/views/admin/events/_all_events.pdf.prawn
+++ b/app/views/admin/events/_all_events.pdf.prawn
@@ -6,6 +6,7 @@ prawn_document(force_download: true, filename: "#{@file_name}.pdf", page_layout:
                   'Start time',
                   'Submitter',
                   'Speaker',
+                  'Speaker Email',
                   'Event Type',
                   'Track',
                   'Difficulty Level',
@@ -21,6 +22,7 @@ prawn_document(force_download: true, filename: "#{@file_name}.pdf", page_layout:
     row << (event.time.present? ? "#{event.time.strftime("%Y-%m-%d")} #{event.time.strftime("%I:%M%p")} " : '')
     row << event.submitter.name
     row << event.speaker_names
+    row << event.speaker_emails
     row << event.event_type.title
     row << (event.track.present? ? event.track.name : '')
     row << (event.difficulty_level.present? ? event.difficulty_level.title : '')
diff --git a/app/views/admin/events/_all_with_comments.pdf.prawn b/app/views/admin/events/_all_with_comments.pdf.prawn
index 2df27759..2a93fe5d 100644
--- a/app/views/admin/events/_all_with_comments.pdf.prawn
+++ b/app/views/admin/events/_all_with_comments.pdf.prawn
@@ -6,6 +6,7 @@ prawn_document(force_download: true, filename: "#{@file_name}.pdf", page_layout:
                   'Start time',
                   'Submitter',
                   'Speaker',
+                  'Speaker Email',
                   'Event Type',
                   'Track',
                   'Difficulty Level',
@@ -21,6 +22,7 @@ prawn_document(force_download: true, filename: "#{@file_name}.pdf", page_layout:
     row << (event.time.present? ? "#{event.time.strftime("%Y-%m-%d")} #{event.time.strftime("%I:%M%p")} " : '')
     row << event.submitter.name
     row << event.speaker_names
+    row << event.speaker_emails
     row << event.event_type.title
     row << (event.track.present? ? event.track.name : '')
     row << (event.difficulty_level.present? ? event.difficulty_level.title : '')
diff --git a/app/views/admin/events/_all_with_comments.xlsx.axlsx b/app/views/admin/events/_all_with_comments.xlsx.axlsx
index 9a9e8c71..430c131d 100644
--- a/app/views/admin/events/_all_with_comments.xlsx.axlsx
+++ b/app/views/admin/events/_all_with_comments.xlsx.axlsx
@@ -1,6 +1,6 @@
 wb.use_shared_strings = true
 wb.add_worksheet(name: 'events with comments') do |sheet|
-  bold_style = wb.styles.add_style( b: true )
+  bold_style = wb.styles.add_style(b: true)
   cell_style = wb.styles.add_style(alignment: { wrap_text: true, vertical: :top })
   row = ['Event ID',
          'Title',
diff --git a/app/views/admin/events/_confirmed_events.pdf.prawn b/app/views/admin/events/_confirmed_events.pdf.prawn
index ea838b94..621a5384 100644
--- a/app/views/admin/events/_confirmed_events.pdf.prawn
+++ b/app/views/admin/events/_confirmed_events.pdf.prawn
@@ -6,6 +6,7 @@ prawn_document(force_download: true, filename: "#{@file_name}.pdf", page_layout:
                   'Start time',
                   'Submitter',
                   'Speaker',
+                  'Speaker Email',
                   'Event Type',
                   'Track',
                   'Difficulty Level',
@@ -21,6 +22,7 @@ prawn_document(force_download: true, filename: "#{@file_name}.pdf", page_layout:
     row << (event.time.present? ? "#{event.time.strftime("%Y-%m-%d")} #{event.time.strftime("%I:%M%p")} " : '')
     row << event.submitter.name
     row << event.speaker_names
+    row << event.speaker_emails
     row << event.event_type.title
     row << (event.track.present? ? event.track.name : '')
     row << (event.difficulty_level.present? ? event.difficulty_level.title : '')

From 6c8ebe586c0312aadc99c97fc626dcded73e4e85 Mon Sep 17 00:00:00 2001
From: Your Name <01namangupta@gmail.com>
Date: Tue, 17 Oct 2017 20:54:53 +0530
Subject: [PATCH 08/26] speakers_names is made in sentense using join

---
 app/models/event.rb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/models/event.rb b/app/models/event.rb
index 2d18db1e..360421f5 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -204,11 +204,7 @@ class Event < ActiveRecord::Base
   end
 
   def speaker_names
-    result = Set.new
-    speakers.each do |speaker|
-      result.add(speaker.name)
-    end
-    result.to_a.to_sentence
+    speakers.map(&:name).join(', ')
   end
 
   # Returns emails of all the speaker belongs to a particular event

From 2e07462d776cfe05ce41c6484dfe70167b87f040 Mon Sep 17 00:00:00 2001
From: Naman Gupta <01namangupta@gmail.com>
Date: Wed, 8 Nov 2017 00:49:03 +0530
Subject: [PATCH 09/26] exports are made to be wrap_text

---
 app/views/admin/events/_all_events.pdf.prawn         | 2 +-
 app/views/admin/events/_all_events.xlsx.axlsx        | 4 +++-
 app/views/admin/events/_all_with_comments.pdf.prawn  | 2 +-
 app/views/admin/events/_all_with_comments.xlsx.axlsx | 1 +
 app/views/admin/events/_confirmed_events.pdf.prawn   | 2 +-
 app/views/admin/events/_confirmed_events.xlsx.axlsx  | 4 +++-
 6 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/views/admin/events/_all_events.pdf.prawn b/app/views/admin/events/_all_events.pdf.prawn
index f13d4a8e..3f1c0d78 100644
--- a/app/views/admin/events/_all_events.pdf.prawn
+++ b/app/views/admin/events/_all_events.pdf.prawn
@@ -32,5 +32,5 @@ prawn_document(force_download: true, filename: "#{@file_name}.pdf", page_layout:
   end
 
   pdf.text "#{@conference.short_title} Events", font_size: 25, align: :center
-  pdf.table events_array, header: true, cell_style: {size: 8, border_width: 1}
+  pdf.table events_array, header: true, cell_style: {size: 8, border_width: 1},column_widths: [40,60,90,50,70,65,85,50,55,50,60,45]
 end
diff --git a/app/views/admin/events/_all_events.xlsx.axlsx b/app/views/admin/events/_all_events.xlsx.axlsx
index 2391e6dc..3197cf38 100644
--- a/app/views/admin/events/_all_events.xlsx.axlsx
+++ b/app/views/admin/events/_all_events.xlsx.axlsx
@@ -1,5 +1,6 @@
 wb.add_worksheet(name: 'all events') do |sheet|
   bold_style = wb.styles.add_style(b: true)
+  wrap_text = wb.styles.add_style alignment: {wrap_text: true}
   row = ['Event ID',
          'Title',
          'Abstract',
@@ -28,6 +29,7 @@ wb.add_worksheet(name: 'all events') do |sheet|
     row << (event.difficulty_level.present? ? event.difficulty_level.title : '')
     row << (event.room.present? ? event.room.name : '')
     row << event.state
-    sheet.add_row row
+    sheet.add_row row , style: wrap_text
+    sheet.column_widths 10,15,35,13,18,18,28,12,15,15,15,10
   end
 end
diff --git a/app/views/admin/events/_all_with_comments.pdf.prawn b/app/views/admin/events/_all_with_comments.pdf.prawn
index 2a93fe5d..ccc9b773 100644
--- a/app/views/admin/events/_all_with_comments.pdf.prawn
+++ b/app/views/admin/events/_all_with_comments.pdf.prawn
@@ -33,7 +33,7 @@ prawn_document(force_download: true, filename: "#{@file_name}.pdf", page_layout:
 
   pdf.text "#{@conference.short_title} Events", font_size: 25, align: :center
   pdf.move_down 10
-  pdf.table events_array, header: true, cell_style: {size: 8, border_width: 1, position: :center}
+  pdf.table events_array, header: true, cell_style: {size: 8, border_width: 1, position: :center},column_widths: [40,60,90,50,70,65,85,50,55,50,60,45]
   pdf.start_new_page
   pdf.text "#{@conference.short_title} Comments", font_size: 25, align: :center
   pdf.move_down 20
diff --git a/app/views/admin/events/_all_with_comments.xlsx.axlsx b/app/views/admin/events/_all_with_comments.xlsx.axlsx
index 430c131d..fd798ca5 100644
--- a/app/views/admin/events/_all_with_comments.xlsx.axlsx
+++ b/app/views/admin/events/_all_with_comments.xlsx.axlsx
@@ -37,5 +37,6 @@ wb.add_worksheet(name: 'events with comments') do |sheet|
     row << event.state
     row << all_comments.strip
     sheet.add_row row, style: cell_style
+    sheet.column_widths 10,15,35,13,18,18,28,12,15,15,15,10
   end
 end
diff --git a/app/views/admin/events/_confirmed_events.pdf.prawn b/app/views/admin/events/_confirmed_events.pdf.prawn
index 621a5384..8bef8883 100644
--- a/app/views/admin/events/_confirmed_events.pdf.prawn
+++ b/app/views/admin/events/_confirmed_events.pdf.prawn
@@ -32,6 +32,6 @@ prawn_document(force_download: true, filename: "#{@file_name}.pdf", page_layout:
   end
 
   pdf.text "#{@conference.short_title} Confirmed Events", font_size: 25, align: :center
-  pdf.table events_array, header: true, cell_style: {size: 8, border_width: 1}
+  pdf.table events_array, header: true, cell_style: {size: 8, border_width: 1},column_widths: [40,60,90,50,70,65,85,50,55,50,60,45]
 
 end
diff --git a/app/views/admin/events/_confirmed_events.xlsx.axlsx b/app/views/admin/events/_confirmed_events.xlsx.axlsx
index 3d1067f6..a1c8c886 100644
--- a/app/views/admin/events/_confirmed_events.xlsx.axlsx
+++ b/app/views/admin/events/_confirmed_events.xlsx.axlsx
@@ -1,5 +1,6 @@
 wb.add_worksheet(name: 'confirmed events') do |sheet|
   bold_style = wb.styles.add_style(b: true)
+  wrap_text = wb.styles.add_style alignment: {wrap_text: true}
   row = ['Event ID',
          'Title',
          'Abstract',
@@ -28,6 +29,7 @@ wb.add_worksheet(name: 'confirmed events') do |sheet|
     row << (event.difficulty_level.present? ? event.difficulty_level.title : '')
     row << (event.room.present? ? event.room.name : '')
     row << event.state
-    sheet.add_row row
+    sheet.add_row row , style: wrap_text
+    sheet.column_widths 10,15,35,13,18,18,28,12,15,15,15,10
   end
 end

From 94de2e813c2f91888e0ec81c5ffe279b5034220a Mon Sep 17 00:00:00 2001
From: Naman Gupta <01namangupta@gmail.com>
Date: Wed, 8 Nov 2017 01:41:42 +0530
Subject: [PATCH 10/26] test is fixed

---
 spec/models/event_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/models/event_spec.rb b/spec/models/event_spec.rb
index 0a84aedd..158e1db3 100644
--- a/spec/models/event_spec.rb
+++ b/spec/models/event_spec.rb
@@ -362,7 +362,7 @@ describe Event do
         new_event.submitter = submitter
         new_event.speakers = [speaker1, speaker2]
 
-        expect(new_event.speaker_names).to eq 'user speaker 1 and user speaker 2'
+        expect(new_event.speaker_names).to eq 'user speaker 1, user speaker 2'
       end
     end
   end

From 1b8f864febb9e6f39099cdfbc0a8c8fef89ee6a8 Mon Sep 17 00:00:00 2001
From: James Mason <jmason@suse.com>
Date: Tue, 7 Nov 2017 13:51:10 -0800
Subject: [PATCH 11/26] Use organization name for title link if available, but
 link to /

---
 app/helpers/application_helper.rb       | 14 ++++++++++++++
 app/views/layouts/_navigation.html.haml |  6 ++----
 spec/features/splashpage_spec.rb        | 14 +++++++++-----
 spec/helpers/application_helper_spec.rb | 16 ++++++++++++++++
 4 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 6174500e..f77d7963 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -171,4 +171,18 @@ module ApplicationHelper
   def hidden_if_conference_over(conference)
     'hidden' if Date.today > conference.end_date
   end
+
+  def nav_root_link_for(conference)
+    link_text = (
+      conference.try(:organization).try(:name) ||
+      ENV['OSEM_NAME'] ||
+      'OSEM'
+    )
+    link_to(
+      link_text,
+      root_path,
+      class: 'navbar-brand',
+      title: 'Open Source Event Manager'
+    )
+  end
 end
diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml
index 9995123b..f7d5fa30 100644
--- a/app/views/layouts/_navigation.html.haml
+++ b/app/views/layouts/_navigation.html.haml
@@ -13,10 +13,8 @@
         %span.icon-bar
         %span.icon-bar
         %span.icon-bar
-      - if conference.nil? || conference.new_record?
-        = link_to (ENV['OSEM_NAME'] || 'OSEM'), root_path, class: 'navbar-brand', title: 'Open Source Event Manager'
-      - else
-        = link_to conference.organization.name, organizations_path, class: 'navbar-brand', title: 'Open Source Event Manager'
+      = nav_root_link_for conference
+
     .collapse.navbar-collapse#main-nav
       - if content_for :splash_nav
         %ul.nav.navbar-nav#splash-nav
diff --git a/spec/features/splashpage_spec.rb b/spec/features/splashpage_spec.rb
index ee9b63d5..d33c6c85 100644
--- a/spec/features/splashpage_spec.rb
+++ b/spec/features/splashpage_spec.rb
@@ -62,14 +62,18 @@ feature Splashpage do
     end
   end
 
-  context 'public splashpage already created' do
+  context 'navigation' do
     let!(:splashpage) { create(:splashpage, conference: conference, public: true)}
 
-    scenario 'should have organization name', feature: true, js: true do
-      sign_in participant
-      visit conference_path(conference.short_title)
+    context 'multiple organizations' do
+      let!(:additional_organization) { create(:organization) }
 
-      expect(page).to have_text(conference.organization.name)
+      scenario 'should have organization name', feature: true, js: true do
+        sign_in participant
+        visit conference_path(conference.short_title)
+
+        expect(page).to have_text(conference.organization.name)
+      end
     end
   end
 end
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 139a5cf9..6cd71d2a 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -58,5 +58,21 @@ describe ApplicationHelper, type: :helper do
         expect(concurrent_events(event).present?).to eq false
       end
     end
+
+    describe 'navigation title link' do
+      it 'should default to OSEM' do
+        ENV.delete('OSEM_NAME')
+        expect(nav_root_link_for(nil)).to match 'OSEM'
+      end
+
+      it 'should use the environment variable' do
+        ENV['OSEM_NAME'] = Faker::Company.name
+        expect(nav_root_link_for(nil)).to match ENV['OSEM_NAME']
+      end
+
+      it 'should use the conference organization name' do
+        expect(nav_root_link_for(conference)).to match conference.organization.name
+      end
+    end
   end
 end

From 714f89f6bafc6d979c1b3356337a03e82625ff1d Mon Sep 17 00:00:00 2001
From: James Mason <jmason@suse.com>
Date: Wed, 11 Oct 2017 20:22:32 -0700
Subject: [PATCH 12/26] Fix missing link on public organizations page

When viewing a conference, the Instance Name in the header points to
/organizations. On the organizations index, there's a button to see
conferences, but it does nothing. This makes it easy for public users to
get lost.

This commit:
* Adds a function to the organizations controller to show child
  conferences
* Adds a public permission to see conferences through an organization
* Represents a subset of conferences, reusing conferences/index view,
  for the organization
---
 app/controllers/organizations_controller.rb   |  6 +++
 app/models/ability.rb                         |  2 +-
 app/views/conferences/index.html.haml         |  4 +-
 app/views/organizations/index.html.haml       |  4 +-
 config/routes.rb                              |  6 ++-
 .../organizations_controller_spec.rb          | 43 +++++++++++++++++++
 spec/features/organization_spec.rb            |  8 ++++
 7 files changed, 68 insertions(+), 5 deletions(-)

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index 3d549dfa..2ebbdeeb 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -4,4 +4,10 @@ class OrganizationsController < ApplicationController
   def index
     @organizations = Organization.all
   end
+
+  def conferences
+    @current = @organization.conferences.upcoming.reorder(start_date: :asc)
+    @antiquated = @organization.conferences.past
+    render '/conferences/index'
+  end
 end
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 18f9d4c4..b833b6f4 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -15,7 +15,7 @@ class Ability
 
   # Abilities for not signed in users (guests)
   def not_signed_in
-    can [:index], Organization
+    can [:index, :conferences], Organization
     can [:index], Conference
     can [:show], Conference do |conference|
       conference.splashpage && conference.splashpage.public == true
diff --git a/app/views/conferences/index.html.haml b/app/views/conferences/index.html.haml
index 032db5c3..a3735478 100644
--- a/app/views/conferences/index.html.haml
+++ b/app/views/conferences/index.html.haml
@@ -4,7 +4,7 @@
       .page-header
         %h2 Upcoming Conferences
   - @current.each do |conference|
-    = render partial: 'conference_details', locals: { conference: conference }
+    = render '/conferences/conference_details', conference: conference
   -if @antiquated and @antiquated.any?
     .row
       .col-md-12
@@ -17,7 +17,7 @@
             %i.fa.fa-chevron-down{ style: 'display: none' }
     #antiquated.collapse
       - @antiquated.each do |conference|
-        = render partial: 'conference_details', locals: { conference: conference}
+        = render '/conferences/conference_details', conference: conference
 
 -content_for :script_body do
   :javascript
diff --git a/app/views/organizations/index.html.haml b/app/views/organizations/index.html.haml
index b2794bd8..bc5a4d5e 100644
--- a/app/views/organizations/index.html.haml
+++ b/app/views/organizations/index.html.haml
@@ -12,5 +12,7 @@
           .caption
             %h4
               = organization.name
-            %button.btn.btn-success Conferences
+            = link_to 'Conferences',
+              conferences_organization_path(organization),
+              class: 'btn btn-success'
             / = link_to 'Edit', edit_organization_path(organization), class: 'btn btn-mini btn-default'
diff --git a/config/routes.rb b/config/routes.rb
index 6e8a66de..33a92a48 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -149,7 +149,11 @@ Osem::Application.routes.draw do
     get '/revision_history/:id/revert_object' => 'versions#revert_object', as: 'revision_history_revert_object'
     get '/revision_history/:id/revert_attribute' => 'versions#revert_attribute', as: 'revision_history_revert_attribute'
   end
-  resources :organizations, only: [:index]
+  resources :organizations, only: [:index] do
+    member do
+      get :conferences
+    end
+  end
   resources :conferences, only: [:index, :show] do
     resources :booths do
       member do
diff --git a/spec/controllers/organizations_controller_spec.rb b/spec/controllers/organizations_controller_spec.rb
index 2916fdea..eb0109a1 100644
--- a/spec/controllers/organizations_controller_spec.rb
+++ b/spec/controllers/organizations_controller_spec.rb
@@ -2,6 +2,26 @@ require 'spec_helper'
 
 describe OrganizationsController do
   let!(:organization) { create(:organization) }
+  let!(:conference) do
+    create(
+      :conference,
+      splashpage:   create(:splashpage, public: true),
+      venue:        create(:venue),
+      organization: organization
+    )
+  end
+  let!(:antiquated_conference) do
+    create(
+      :conference,
+      splashpage:   create(:splashpage, public: true),
+      venue:        create(:venue),
+      organization: organization,
+      start_date:   2.weeks.ago,
+      end_date:     1.week.ago
+    )
+  end
+
+  let!(:other_conference) { create(:conference) }
   let!(:user) { create(:user) }
 
   describe 'GET #index' do
@@ -12,4 +32,27 @@ describe OrganizationsController do
 
     it { expect(response).to render_template('index') }
   end
+
+  describe 'GET #conferences' do
+    before :each do
+      get :conferences, id: organization.id
+    end
+
+    it 'loads the organization' do
+      expect(assigns(:organization)).to eq organization
+    end
+
+    it 'includes organization conferences' do
+      expect(assigns(:current)).to include conference
+    end
+
+    it 'does not include conferences outside organization' do
+      expect(assigns(:current)).not_to include other_conference
+      expect(assigns(:antiquated)).not_to include other_conference
+    end
+
+    it 'includes antiquated organization conferences' do
+      expect(assigns(:antiquated)).to include antiquated_conference
+    end
+  end
 end
diff --git a/spec/features/organization_spec.rb b/spec/features/organization_spec.rb
index 6fcf590b..72948c2d 100644
--- a/spec/features/organization_spec.rb
+++ b/spec/features/organization_spec.rb
@@ -48,4 +48,12 @@ feature Organization do
 
     it_behaves_like 'successfully updates an organization'
   end
+
+  context 'anonymously' do
+    scenario 'index should link to conferences list' do
+      visit organizations_path
+
+      expect(page).to have_link('Conferences', href: "/organizations/#{organization.id}/conferences")
+    end
+  end
 end

From 574ac63a05ed428725e2e5979b540e89d3d24f2a Mon Sep 17 00:00:00 2001
From: James Mason <jmason@suse.com>
Date: Tue, 7 Nov 2017 17:57:45 -0800
Subject: [PATCH 13/26] Fix a flaky test.

---
 spec/helpers/application_helper_spec.rb | 6 +++---
 spec/spec_helper.rb                     | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 6cd71d2a..6626ed87 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -66,12 +66,12 @@ describe ApplicationHelper, type: :helper do
       end
 
       it 'should use the environment variable' do
-        ENV['OSEM_NAME'] = Faker::Company.name
-        expect(nav_root_link_for(nil)).to match ENV['OSEM_NAME']
+        ENV['OSEM_NAME'] = Faker::Company.name + "'"
+        expect(nav_root_link_for(nil)).to match h(ENV['OSEM_NAME'])
       end
 
       it 'should use the conference organization name' do
-        expect(nav_root_link_for(conference)).to match conference.organization.name
+        expect(nav_root_link_for(conference)).to match h(conference.organization.name)
       end
     end
   end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index d9283117..704b8e08 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -26,6 +26,10 @@ require 'phantomjs'
 # makes it easier to control when PaperTrail is enabled during testing.
 require 'paper_trail/frameworks/rspec'
 
+# Make htmlescape() available
+require 'erb'
+include ERB::Util
+
 # Requires supporting ruby files with custom matchers and macros, etc, in
 # spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
 # run as spec files by default. This means that files in spec/support that end

From 90edc648f877c3cdb0a9654469ec86cf6843bc5b Mon Sep 17 00:00:00 2001
From: Naman Gupta <01namangupta@gmail.com>
Date: Thu, 9 Nov 2017 01:40:56 +0530
Subject: [PATCH 14/26] programs.speakers is fixed

---
 app/models/program.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/models/program.rb b/app/models/program.rb
index 612d8154..03e5725a 100644
--- a/app/models/program.rb
+++ b/app/models/program.rb
@@ -42,7 +42,8 @@ class Program < ActiveRecord::Base
   has_many :event_schedules, through: :events
 
   has_many :event_users, through: :events
-  has_many :speakers, -> { distinct }, through: :event_users, source: :user do
+  has_many :program_events_speakers, -> {where(event_role: 'speaker')},through: :events, source: :event_users
+  has_many :speakers, -> { distinct }, through: :program_events_speakers, source: :user do
     def confirmed
       joins(:events).where(events: { state: :confirmed })
     end

From ada0f814a7d9bd5f05b58c35b3bae9fcc7c397ff Mon Sep 17 00:00:00 2001
From: Naman Gupta <01namangupta@gmail.com>
Date: Thu, 9 Nov 2017 02:00:49 +0530
Subject: [PATCH 15/26] linting error is fixed

---
 app/models/program.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/program.rb b/app/models/program.rb
index 03e5725a..addda157 100644
--- a/app/models/program.rb
+++ b/app/models/program.rb
@@ -42,7 +42,7 @@ class Program < ActiveRecord::Base
   has_many :event_schedules, through: :events
 
   has_many :event_users, through: :events
-  has_many :program_events_speakers, -> {where(event_role: 'speaker')},through: :events, source: :event_users
+  has_many :program_events_speakers, -> {where(event_role: 'speaker')}, through: :events, source: :event_users
   has_many :speakers, -> { distinct }, through: :program_events_speakers, source: :user do
     def confirmed
       joins(:events).where(events: { state: :confirmed })

From d0dbb7d29e4cd0d1165a7f72210c5f283b08f45c Mon Sep 17 00:00:00 2001
From: Naman Gupta <01namangupta@gmail.com>
Date: Thu, 9 Nov 2017 02:39:41 +0530
Subject: [PATCH 16/26] tests are fixed

---
 spec/models/program_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/models/program_spec.rb b/spec/models/program_spec.rb
index 1c8eabd9..62e576f4 100644
--- a/spec/models/program_spec.rb
+++ b/spec/models/program_spec.rb
@@ -15,8 +15,8 @@ describe Program do
     it { is_expected.to have_many(:events).dependent(:destroy) }
     it { is_expected.to have_many(:event_schedules).through(:events) }
     it { is_expected.to have_many(:event_users).through(:events) }
-    it { is_expected.to have_many(:speakers).through(:event_users).source(:user) }
-
+    it { is_expected.to have_many(:program_events_speakers).through(:events).source(:event_users) }
+    it { is_expected.to have_many(:speakers).through(:program_events_speakers).source(:user) }
     it { is_expected.to accept_nested_attributes_for(:event_types) }
     it { is_expected.to accept_nested_attributes_for(:tracks) }
     it { is_expected.to accept_nested_attributes_for(:difficulty_levels) }

From 6fa709a4de497a52100d14b458a975a4fe7ca645 Mon Sep 17 00:00:00 2001
From: Adriano Vieira <adriano.svieira@gmail.com>
Date: Sun, 12 Nov 2017 01:55:03 -0200
Subject: [PATCH 17/26] Fix to only show speaker email if it's public

---
 app/views/proposals/show.html.haml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/proposals/show.html.haml b/app/views/proposals/show.html.haml
index c181e283..19f9371f 100644
--- a/app/views/proposals/show.html.haml
+++ b/app/views/proposals/show.html.haml
@@ -36,7 +36,8 @@
             .col-md-8
               %h4
                 = link_to speaker.name, user_path(speaker.id)
-                = "(#{speaker.email})"
+                - if speaker.email_public?
+                  = "(#{speaker.email})"
               - if speaker.affiliation?
                 .text-muted
                   from

From fba12aef24ff3388bb44a29df63e9e3496f8eb0a Mon Sep 17 00:00:00 2001
From: James Mason <jmason@suse.com>
Date: Sun, 12 Nov 2017 20:43:02 -0800
Subject: [PATCH 18/26] Only include transifex JS if the ENV var is set

... otherwise, don't bother loading this blocking external resource.
---
 app/views/layouts/application.html.haml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index c1a6ce78..ee88a24c 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -9,15 +9,16 @@
     = javascript_include_tag "application"
 
     = csrf_meta_tags
-    :javascript
-      window.liveSettings = {
-        api_key: "#{ENV['OSEM_TRANSIFEX_APIKEY']}",
-        picker: "bottom-right",
-        detectlang: true,
-        autocollect: true
-      };
     = content_for(:script_head)
-    = javascript_include_tag "//cdn.transifex.com/live.js"
+    - if ENV['OSEM_TRANSIFEX_APIKEY']
+      :javascript
+        window.liveSettings = {
+          api_key: "#{ENV['OSEM_TRANSIFEX_APIKEY']}",
+          picker: "bottom-right",
+          detectlang: true,
+          autocollect: true
+        };
+      = javascript_include_tag "//cdn.transifex.com/live.js"
 
     = yield(:head)
   %body

From bd045c2976156502a456fcb06904e4cbcbae75b1 Mon Sep 17 00:00:00 2001
From: ViditChitkara <chitkara.vidit@gmail.com>
Date: Tue, 5 Sep 2017 18:15:46 +0530
Subject: [PATCH 19/26] added description field to cfps

closes #1650

done some changes

minor changes

added markdown format to cfp#show

fixed description text  position in proposals

fixed truncated description text in show action

minor changes on non-admin side
---
 app/controllers/admin/cfps_controller.rb             | 2 +-
 app/views/admin/cfps/_booths_cfp.html.haml           | 6 +++++-
 app/views/admin/cfps/_events_cfp.html.haml           | 4 ++++
 app/views/admin/cfps/_form.html.haml                 | 1 +
 app/views/admin/cfps/_tracks_cfp.html.haml           | 4 ++++
 app/views/admin/cfps/index.html.haml                 | 4 ++++
 app/views/proposals/index.html.haml                  | 8 ++++++++
 app/views/proposals/new.html.haml                    | 5 +++++
 db/migrate/20170905110034_add_description_to_cfps.rb | 5 +++++
 db/schema.rb                                         | 5 +++--
 spec/factories/cfps.rb                               | 2 +-
 11 files changed, 41 insertions(+), 5 deletions(-)
 create mode 100644 db/migrate/20170905110034_add_description_to_cfps.rb

diff --git a/app/controllers/admin/cfps_controller.rb b/app/controllers/admin/cfps_controller.rb
index da2723b7..18b493eb 100644
--- a/app/controllers/admin/cfps_controller.rb
+++ b/app/controllers/admin/cfps_controller.rb
@@ -55,7 +55,7 @@ module Admin
     private
 
     def cfp_params
-      params.require(:cfp).permit(:start_date, :end_date, :cfp_type)
+      params.require(:cfp).permit(:start_date, :end_date, :description, :cfp_type)
     end
   end
 end
diff --git a/app/views/admin/cfps/_booths_cfp.html.haml b/app/views/admin/cfps/_booths_cfp.html.haml
index 7cdc6db4..2b82f813 100644
--- a/app/views/admin/cfps/_booths_cfp.html.haml
+++ b/app/views/admin/cfps/_booths_cfp.html.haml
@@ -11,6 +11,10 @@
 %dd
   = @cfp.end_date.strftime('%A, %B %e. %Y')
 %dt
-  Days Left:
+  Description
+%dd
+  = markdown(@cfp.description)
+%dt
+  Days Left
 %dd
   = pluralize(@cfp.remaining_days, 'day')
diff --git a/app/views/admin/cfps/_events_cfp.html.haml b/app/views/admin/cfps/_events_cfp.html.haml
index f06aa6ca..f4557bb4 100644
--- a/app/views/admin/cfps/_events_cfp.html.haml
+++ b/app/views/admin/cfps/_events_cfp.html.haml
@@ -10,6 +10,10 @@
   End Date:
 %dd#end_date
   = @cfp.end_date.strftime('%A, %B %-d. %Y')
+%dt
+  Description:
+%dd#description
+  = markdown(@cfp.description)
 %dt
   Days Left:
 %dd
diff --git a/app/views/admin/cfps/_form.html.haml b/app/views/admin/cfps/_form.html.haml
index a02f3a02..b42a76e1 100644
--- a/app/views/admin/cfps/_form.html.haml
+++ b/app/views/admin/cfps/_form.html.haml
@@ -8,5 +8,6 @@
       = f.input :start_date, as: :string, input_html: { id: 'registration-period-start-datepicker', start_date: @conference.start_date, end_date: @conference.end_date, readonly: 'readonly' }
       = f.input :end_date, as: :string, input_html: { id: 'registration-period-end-datepicker', readonly: 'readonly' }
       = f.input :cfp_type, as: :select, collection: (@cfp.new_record? ? @program.remaining_cfp_types : [@cfp.cfp_type] + @program.remaining_cfp_types).map {|type| ["#{type.capitalize}", type]}, include_blank: false, label: 'Type', input_html: { class: 'select-help-toggle' }
+      = f.input :description, input_html: {rows: 2, data: { provide: 'markdown-editable' } }, hint: markdown_hint
       %p.text-right
         = f.action :submit, as: :button, button_html: { class: 'btn btn-primary' }
diff --git a/app/views/admin/cfps/_tracks_cfp.html.haml b/app/views/admin/cfps/_tracks_cfp.html.haml
index bcc2df43..20926758 100644
--- a/app/views/admin/cfps/_tracks_cfp.html.haml
+++ b/app/views/admin/cfps/_tracks_cfp.html.haml
@@ -10,6 +10,10 @@
   End Date:
 %dd#end_date
   = @cfp.end_date.strftime('%A, %B %-d. %Y')
+%dt
+  Description:
+%dd#description
+  = markdown(@cfp.description)
 %dt
   Days Left:
 %dd
diff --git a/app/views/admin/cfps/index.html.haml b/app/views/admin/cfps/index.html.haml
index 0067229c..fb075eae 100644
--- a/app/views/admin/cfps/index.html.haml
+++ b/app/views/admin/cfps/index.html.haml
@@ -12,6 +12,7 @@
           %th Type
           %th Start Date
           %th End Date
+          %th Description
           %th Days Left
           %th Actions
         %tbody
@@ -24,6 +25,9 @@
                 = cfp.start_date.strftime('%A, %B %-d. %Y')
               %td
                 = cfp.end_date.strftime('%A, %B %-d. %Y')
+              %td
+                %p
+                  = markdown(truncate(cfp.description))
               %td
                 = pluralize(cfp.remaining_days, 'day')
               %td
diff --git a/app/views/proposals/index.html.haml b/app/views/proposals/index.html.haml
index 97a721c0..e40eb30e 100644
--- a/app/views/proposals/index.html.haml
+++ b/app/views/proposals/index.html.haml
@@ -6,6 +6,14 @@
         %span.notranslate
           = @conference.title
 
+
+  - if @program.cfp_open?
+    - if @program.cfp.description.present?
+      .row
+        .col-md-12
+          = markdown(@program.cfp.description)
+
+
   .row
     .col-md-12
       = render partial: 'encouragement_text'
diff --git a/app/views/proposals/new.html.haml b/app/views/proposals/new.html.haml
index 25a78786..0f699559 100644
--- a/app/views/proposals/new.html.haml
+++ b/app/views/proposals/new.html.haml
@@ -3,6 +3,11 @@
     .col-md-12
       .page-header
         %h1 New Proposal
+  - if @program.cfp_open?
+    - if @program.cfp.description.present?
+      .row
+        .col-md-12
+          = markdown(@program.cfp.description)
   .row
     .col-md-12
       = render partial: 'encouragement_text'
diff --git a/db/migrate/20170905110034_add_description_to_cfps.rb b/db/migrate/20170905110034_add_description_to_cfps.rb
new file mode 100644
index 00000000..a4976ee2
--- /dev/null
+++ b/db/migrate/20170905110034_add_description_to_cfps.rb
@@ -0,0 +1,5 @@
+class AddDescriptionToCfps < ActiveRecord::Migration
+  def change
+    add_column :cfps, :description, :text
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 6c6531c1..bdf3ad65 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -68,12 +68,13 @@ ActiveRecord::Schema.define(version: 20170924190528) do
   end
 
   create_table "cfps", force: :cascade do |t|
-    t.date     "start_date", null: false
-    t.date     "end_date",   null: false
+    t.date     "start_date",  null: false
+    t.date     "end_date",    null: false
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "program_id"
     t.string   "cfp_type"
+    t.text     "description"
   end
 
   create_table "comments", force: :cascade do |t|
diff --git a/spec/factories/cfps.rb b/spec/factories/cfps.rb
index 6b061d53..ea59a8c1 100644
--- a/spec/factories/cfps.rb
+++ b/spec/factories/cfps.rb
@@ -5,7 +5,7 @@ FactoryGirl.define do
     start_date { 1.day.ago }
     end_date { 2.days.from_now }
     cfp_type 'events'
-
+    description 'This is a test description'
     program
   end
 end

From 837d8ec0db282d3c7ef0b3011ab2fc75b3b8d69b Mon Sep 17 00:00:00 2001
From: rahul <rahulsingh2240@gmail.com>
Date: Tue, 17 Oct 2017 20:01:15 +0530
Subject: [PATCH 20/26] Add popup confirmation on update button

Popup is added so user can confirm the changes
Closes https://github.com/openSUSE/osem/issues/1687
---
 app/views/admin/conferences/edit.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admin/conferences/edit.html.haml b/app/views/admin/conferences/edit.html.haml
index 26ae198f..b14fd7bb 100644
--- a/app/views/admin/conferences/edit.html.haml
+++ b/app/views/admin/conferences/edit.html.haml
@@ -29,4 +29,4 @@
       = f.inputs name: 'Booths' do
         = f.input :booth_limit, as: :number, in: 0..9999,
         hint: 'Booth limit is the maximum number of booths that you can accept for this conference. By setting this number (0 no limit) you can be sure that you are not going to accept more booths than the conference can accommodate. You currently have ' + pluralize(@conference.booths.accepted.count, 'accepted booth') +'.'
-      = f.action :submit, as: :button, button_html: {class: 'btn btn-primary'}
+      = f.action :submit, as: :button, button_html: { class: 'btn btn-primary', data: { confirm: 'Are you sure you want to proceed?' } }

From 4785293bf1348549ade1c68ef35f613eaa509a6f Mon Sep 17 00:00:00 2001
From: rahul <rahulsingh2240@gmail.com>
Date: Sat, 11 Nov 2017 00:54:31 +0530
Subject: [PATCH 21/26] Add hint in start and end hour in conference#edit

---
 app/controllers/admin/conferences_controller.rb | 1 +
 app/helpers/application_helper.rb               | 6 ++++++
 app/views/admin/conferences/edit.html.haml      | 4 ++--
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/controllers/admin/conferences_controller.rb b/app/controllers/admin/conferences_controller.rb
index d8c101d1..8f8f2959 100644
--- a/app/controllers/admin/conferences_controller.rb
+++ b/app/controllers/admin/conferences_controller.rb
@@ -193,6 +193,7 @@ module Admin
     def edit
       @conferences = Conference.all
       @date_string = date_string(@conference.start_date, @conference.end_date)
+      @affected_event_count = @conference.program.events.scheduled(@conference.program.selected_schedule_id).count
       respond_to do |format|
         format.html
         format.json { render json: @conference.to_json }
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index f77d7963..b5e2892e 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -163,6 +163,12 @@ module ApplicationHelper
     end
   end
 
+  def rescheduling_hint(affected_event_count)
+    if affected_event_count > 0
+      "You have #{affected_event_count} scheduled #{'event'.pluralize(affected_event_count)}. Changing the conference hours will unschedule those scheduled outside the conference hours."
+    end
+  end
+
   ##
   # ====Gets
   # a conference object
diff --git a/app/views/admin/conferences/edit.html.haml b/app/views/admin/conferences/edit.html.haml
index b14fd7bb..ac90610d 100644
--- a/app/views/admin/conferences/edit.html.haml
+++ b/app/views/admin/conferences/edit.html.haml
@@ -22,8 +22,8 @@
         = f.input :timezone, as: :time_zone, hint: 'The conference time zone'
         = f.input :start_date, as: :string, input_html: { id: 'conference-start-datepicker', readonly: 'readonly' }
         = f.input :end_date, as: :string, input_html: { id: 'conference-end-datepicker', readonly: 'readonly' }
-        = f.input :start_hour, input_html: {size: 2, type: 'number', min: 0, max: 23}
-        = f.input :end_hour, input_html: {size: 2, type: 'number', min: 1, max: 24}
+        = f.input :start_hour, input_html: {size: 2, type: 'number', min: 0, max: 23}, hint: rescheduling_hint(@affected_event_count)
+        = f.input :end_hour, input_html: {size: 2, type: 'number', min: 1, max: 24}, hint: rescheduling_hint(@affected_event_count)
       = f.inputs name: 'Registrations' do
         = f.input :registration_limit, as: :number, in: 0..9999, hint: 'Limit the number of registrations to the conference (0 no limit). Please note that the registration limit doesn\'t apply to speakers of confirmed events (they will still be able to register even if it has been reached). You currently have ' + pluralize(@conference.registrations.count, 'registration')
       = f.inputs name: 'Booths' do

From 207319ae57d19411d02ca7cad4d4e39102b6fe12 Mon Sep 17 00:00:00 2001
From: James Mason <jmason@suse.com>
Date: Sun, 12 Nov 2017 17:53:00 -0800
Subject: [PATCH 22/26] Control config.force_ssl with an ENV variable

---
 config/environments/production.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/environments/production.rb b/config/environments/production.rb
index 4e2c2e79..a70ef729 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -33,7 +33,7 @@ Osem::Application.configure do
   # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
-  # config.force_ssl = true
+  config.force_ssl = !!ENV['FORCE_SSL']
 
   # See everything in the log (default is :info)
   config.log_level = :info

From 668c7dede9a028a25c26cb2078290d18a172dbd1 Mon Sep 17 00:00:00 2001
From: James Mason <jmason@suse.com>
Date: Tue, 14 Nov 2017 14:11:57 -0800
Subject: [PATCH 23/26] Add FORCE_SSL to the dotenv example

---
 dotenv.example | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dotenv.example b/dotenv.example
index 77c28e4c..b79068d6 100644
--- a/dotenv.example
+++ b/dotenv.example
@@ -63,3 +63,6 @@ OSEM_SMTP_OPENSSL_VERIFY_MODE=""
 
 # Enable the usage of the devise ichain plugin
 OSEM_ICHAIN_ENABLED=false
+
+# enable this to force SSL
+# FORCE_SSL="1"

From f2d381398617aacfa5f045ca8c023aacefb4e5d2 Mon Sep 17 00:00:00 2001
From: evris99 <cptevris@gmail.com>
Date: Thu, 16 Nov 2017 18:34:47 +0200
Subject: [PATCH 24/26] Changed db:migrate to db:schema:load

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 6650fbf9..88c50189 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ before_script:
   - cp config/database.yml.travis config/database.yml
   - cp config/secrets.yml.example config/secrets.yml
   - mysql -u root -e 'create database osem_test;'
-  - RAILS_ENV=test bundle exec rake db:migrate --trace
+  - RAILS_ENV=test bundle exec rake db:schema:load --trace
 script:
   - "./travis_script.sh $TEST_SUITE"
 env:

From e32837b3b1af3bb03da04e2dbc05271ccf99a5aa Mon Sep 17 00:00:00 2001
From: Naman Gupta <01namangupta@gmail.com>
Date: Fri, 17 Nov 2017 00:41:20 +0530
Subject: [PATCH 25/26] schema is added

---
 db/schema.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index bdf3ad65..ea1e3dd7 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -505,7 +505,7 @@ ActiveRecord::Schema.define(version: 20170924190528) do
     t.integer  "user_id"
     t.integer  "payment_id"
     t.integer  "week"
-    t.float    "amount_paid"
+    t.float    "amount_paid",   default: 0.0
   end
 
   create_table "ticket_scannings", force: :cascade do |t|
@@ -579,7 +579,6 @@ ActiveRecord::Schema.define(version: 20170924190528) do
     t.boolean  "is_admin",               default: false
     t.string   "username"
     t.boolean  "is_disabled",            default: false
-    t.string   "token"
   end
 
   add_index "users", ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true

From 9885b3617f249cf5df4b8212d479e1fb0f3a50ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ana=20Mar=C3=ADa=20Mart=C3=ADnez=20G=C3=B3mez?=
 <ammartinez@suse.de>
Date: Fri, 17 Nov 2017 10:07:02 +0100
Subject: [PATCH 26/26] Update yajl-ruby to 1.3.1

There is a security vulnerability in yajl-ruby 1.3.0:

In the yajl-ruby gem 1.3.0 for Ruby, when a crafted JSON file is
supplied to `Yajl::Parser.new.parse`, the whole ruby process crashes
with a `SIGABRT` in the `yajl_string_decode` function in
`yajl_encode.c`. This results in the whole ruby process terminating and
potentially a denial of service.

Reference:

https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-16516
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index bad063c8..cdc4e0cb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -555,7 +555,7 @@ GEM
       chronic (>= 0.6.3)
     xpath (2.0.0)
       nokogiri (~> 1.3)
-    yajl-ruby (1.3.0)
+    yajl-ruby (1.3.1)
 
 PLATFORMS
   ruby
@@ -668,4 +668,4 @@ DEPENDENCIES
   whenever
 
 BUNDLED WITH
-   1.15.4
+   1.16.0