Merge pull request #8 from openSUSE/master

Merge what happened on the live instance

.gitignore

@@ -1,3 +1,8 @@
+config/application.rb
+config/config.yml
+config/database.yml
+/vendor/cache
+/vendor/cache-old
 /storage/*
 .idea/*
 *.iml

Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails', '3.2.9'
+gem 'rails', '3.2.11'
 
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
@@ -12,12 +12,12 @@ gem 'mysql2'
 # in production environments by default.
 group :assets do
   gem 'sass-rails',   '~> 3.2.3'
-  gem 'coffee-rails', '~> 3.2.1'
+#  gem 'coffee-rails', '~> 3.2.1'
 
   # See https://github.com/sstephenson/execjs#readme for more supported runtimes
   # gem 'therubyracer', :platforms => :ruby
 
-  gem 'uglifier', '>= 1.0.3'
+#  gem 'uglifier', '>= 1.0.3'
 end
 
 gem 'will_paginate'
@@ -28,7 +28,7 @@ gem 'devise'
 gem 'cancan'
 gem "haml"
 gem 'bcrypt-ruby', '~> 3.0.0'
-gem 'node'
+#gem 'node'
 gem 'paper_trail'
 gem 'formtastic-bootstrap'
 gem 'cocoon'

Gemfile.lock

@@ -2,12 +2,12 @@ GEM
   remote: https://rubygems.org/
   specs:
     Ascii85 (1.0.2)
-    actionmailer (3.2.9)
-      actionpack (= 3.2.9)
+    actionmailer (3.2.11)
+      actionpack (= 3.2.11)
       mail (~> 2.4.4)
-    actionpack (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    actionpack (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -15,86 +15,77 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.9)
-      activesupport (= 3.2.9)
+    activemodel (3.2.11)
+      activesupport (= 3.2.11)
       builder (~> 3.0.0)
-    activerecord (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    activerecord (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
-    activesupport (3.2.9)
+    activeresource (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
+    activesupport (3.2.11)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    acts_as_commentable_with_threading (1.1.2)
+    acts_as_commentable_with_threading (1.1.3)
       activerecord (>= 3.0)
       activesupport (~> 3.0)
       awesome_nested_set (>= 2.0)
     afm (0.2.0)
     arel (3.0.2)
-    awesome_nested_set (2.1.5)
+    awesome_nested_set (2.1.6)
       activerecord (>= 3.0.0)
     bcrypt-ruby (3.0.1)
     builder (3.0.4)
-    cancan (1.6.8)
-    cocaine (0.4.2)
-    cocoon (1.1.1)
-    coffee-rails (3.2.2)
-      coffee-script (>= 2.2.0)
-      railties (~> 3.2.0)
-    coffee-script (2.2.0)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.4.0)
-    devise (2.1.2)
+    cancan (1.6.10)
+    climate_control (0.0.3)
+      activesupport (>= 3.0)
+    cocaine (0.5.1)
+      climate_control (>= 0.0.3, < 1.0)
+    cocoon (1.1.2)
+    devise (2.2.4)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
       railties (~> 3.1)
       warden (~> 1.2.1)
     erubis (2.7.0)
-    eventmachine (1.0.0)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
     formtastic (2.2.1)
       actionpack (>= 3.0)
-    formtastic-bootstrap (2.0.0)
+    formtastic-bootstrap (2.1.1)
       formtastic (~> 2.2)
-      formtastic-bootstrap
-    haml (3.1.7)
+    haml (4.0.2)
+      tilt
     hashery (2.1.0)
-    hike (1.2.1)
-    i18n (0.6.1)
+    hike (1.2.2)
+    i18n (0.6.4)
     journey (1.0.4)
-    jquery-fileupload-rails (0.4.0)
+    jquery-fileupload-rails (0.4.1)
       actionpack (>= 3.1)
       railties (>= 3.1)
-    jquery-rails (2.1.4)
+    jquery-rails (2.2.1)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.7.6)
+    json (1.8.0)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.19)
-    multi_json (1.5.0)
+    mime-types (1.23)
+    multi_json (1.7.3)
     mysql2 (0.3.11)
-    node (0.0.2)
-      eventmachine
     orm_adapter (0.4.0)
-    paper_trail (2.7.0)
+    paper_trail (2.7.1)
       activerecord (~> 3.0)
       railties (~> 3.0)
-    paperclip (3.4.0)
+    paperclip (3.4.1)
       activemodel (>= 3.0.0)
       activerecord (>= 3.0.0)
       activesupport (>= 3.0.0)
-      cocaine (~> 0.4.0)
+      cocaine (~> 0.5.0)
       mime-types
-    pdf-reader (1.3.0)
+    pdf-reader (1.3.3)
       Ascii85 (~> 1.0.0)
       afm (~> 0.2.0)
       hashery (~> 2.0)
@@ -107,30 +98,30 @@ GEM
     prawn_rails (0.0.11)
       prawn (>= 0.11.1)
       railties (>= 3.0.0)
-    rack (1.4.3)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.9)
-      actionmailer (= 3.2.9)
-      actionpack (= 3.2.9)
-      activerecord (= 3.2.9)
-      activeresource (= 3.2.9)
-      activesupport (= 3.2.9)
+    rails (3.2.11)
+      actionmailer (= 3.2.11)
+      actionpack (= 3.2.11)
+      activerecord (= 3.2.11)
+      activeresource (= 3.2.11)
+      activesupport (= 3.2.11)
       bundler (~> 1.0)
-      railties (= 3.2.9)
-    railties (3.2.9)
-      actionpack (= 3.2.9)
-      activesupport (= 3.2.9)
+      railties (= 3.2.11)
+    railties (3.2.11)
+      actionpack (= 3.2.11)
+      activesupport (= 3.2.11)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.0.3)
-    rdoc (3.12)
+    rake (10.0.4)
+    rdoc (3.12.2)
       json (~> 1.4)
     ruby-rc4 (0.1.5)
     sass (3.2.5)
@@ -143,18 +134,15 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.6)
-    thor (0.16.0)
-    tilt (1.3.3)
-    transitions (0.1.4)
+    sqlite3 (1.3.7)
+    thor (0.18.1)
+    tilt (1.4.1)
+    transitions (0.1.8)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
     ttfunk (1.0.3)
-    tzinfo (0.3.35)
-    uglifier (1.3.0)
-      execjs (>= 0.3.0)
-      multi_json (~> 1.0, >= 1.0.2)
+    tzinfo (0.3.37)
     warden (1.2.1)
       rack (>= 1.0)
     will_paginate (3.0.4)
@@ -167,21 +155,18 @@ DEPENDENCIES
   bcrypt-ruby (~> 3.0.0)
   cancan
   cocoon
-  coffee-rails (~> 3.2.1)
   devise
   formtastic-bootstrap
   haml
   jquery-fileupload-rails
   jquery-rails
   mysql2
-  node
   paper_trail
   paperclip (~> 3.0)
   prawn
   prawn_rails
-  rails (= 3.2.9)
+  rails (= 3.2.11)
   sass-rails (~> 3.2.3)
   sqlite3
   transitions
-  uglifier (>= 1.0.3)
   will_paginate

db/migrate/20130515125823_change_attachment_default.rb

@@ -0,0 +1,8 @@
+class ChangeAttachmentDefault < ActiveRecord::Migration
+  def up
+    change_column_default(:event_attachments, :public, :default => true)
+  end
+  def down
+    change_column_default(:event_attachments, :public, :default => nil)
+  end
+end

db/migrate/20130515131210_drop_additional_speakers.rb

@@ -0,0 +1,9 @@
+class DropAdditionalSpeakers < ActiveRecord::Migration
+  def up
+    remove_column :registrations, :additional_speakers
+  end
+
+  def down
+    add_column :registrations, :additional_speakers
+  end
+end

db/migrate/20130515131420_change_venue_types.rb

@@ -0,0 +1,11 @@
+class ChangeVenueTypes < ActiveRecord::Migration
+  def up
+    change_column :venues, :name, :text
+    change_column :venues, :address, :text
+  end
+
+  def down
+    change_column :venues, :name, :string
+    change_column :venues, :address, :string
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130216122417) do
+ActiveRecord::Schema.define(:version => 20130515131420) do
 
   create_table "call_for_papers", :force => true do |t|
     t.date     "start_date",    :null => false
@@ -91,14 +91,14 @@ ActiveRecord::Schema.define(:version => 20130216122417) do
 
   create_table "event_attachments", :force => true do |t|
     t.integer  "event_id"
-    t.string   "title",                   :null => false
+    t.string   "title",                                      :null => false
     t.string   "attachment_file_name"
     t.string   "attachment_content_type"
     t.integer  "attachment_file_size"
     t.datetime "attachment_updated_at"
-    t.datetime "created_at",              :null => false
-    t.datetime "updated_at",              :null => false
-    t.boolean  "public"
+    t.datetime "created_at",                                 :null => false
+    t.datetime "updated_at",                                 :null => false
+    t.boolean  "public",                  :default => false
   end
 
   create_table "event_people", :force => true do |t|
@@ -171,7 +171,6 @@ ActiveRecord::Schema.define(:version => 20130216122417) do
     t.boolean  "using_affiliated_lodging",    :default => false
     t.datetime "arrival"
     t.datetime "departure"
-    t.text     "additional_speakers"
     t.datetime "created_at",                                     :null => false
     t.datetime "updated_at",                                     :null => false
     t.integer  "dietary_choice_id"
@@ -262,14 +261,14 @@ ActiveRecord::Schema.define(:version => 20130216122417) do
 
   create_table "venues", :force => true do |t|
     t.string   "guid"
-    t.string   "name"
-    t.string   "address"
+    t.text     "name",               :limit => 255
+    t.text     "address",            :limit => 255
     t.string   "website"
     t.text     "description"
     t.string   "offline_map_url"
     t.string   "offline_map_bounds"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
+    t.datetime "created_at",                        :null => false
+    t.datetime "updated_at",                        :null => false
   end
 
   create_table "versions", :force => true do |t|