Re-adds all images in /icons folder (Icon? fail again)

This reverts commit 032182d8d1.

.gitignore

@@ -3,7 +3,6 @@ db/*.sqlite3
 log/*.log
 tmp/
 
-Icon*
 .DS_Store
 dump.rdb
 Thumbs.db
@@ -14,4 +13,4 @@ Thumbs.db
 /public/.sass-cache/
 /public/media/
 /public/assets/
-/public/cache/
+/public/cache/

Gemfile

@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 gem 'rake'
 
-gem 'rails', '3.2.8'
+gem 'rails', '3.2.11'
 gem 'jquery-rails', '1.0.12'
 
 # templating
@@ -32,6 +32,8 @@ gem 'omniauth-openid'
 # for file upload ( -> avatar )
 gem 'paperclip',  '~> 2.3'
 
+gem 'pg', group: :production
+
 group :assets do
   gem 'sass-rails',   '~> 3.2.3'
   gem 'coffee-rails', '~> 3.2.1'

Gemfile.lock

@@ -4,31 +4,31 @@ GEM
     7digital (0.1.2)
       nokogiri (>= 1.5.0)
       oauth (>= 0.4.5)
-    actionmailer (3.2.8)
-      actionpack (= 3.2.8)
+    actionmailer (3.2.11)
+      actionpack (= 3.2.11)
       mail (~> 2.4.4)
-    actionpack (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    actionpack (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
       rack (~> 1.4.0)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.11)
+      activesupport (= 3.2.11)
       builder (~> 3.0.0)
-    activerecord (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    activerecord (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-    activesupport (3.2.8)
+    activeresource (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
+    activesupport (3.2.11)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
@@ -72,7 +72,7 @@ GEM
     jquery-rails (1.0.12)
       railties (~> 3.0)
       thor (~> 0.14)
-    json (1.7.5)
+    json (1.7.6)
     jwt (0.1.5)
       multi_json (>= 1.0)
     mail (2.4.4)
@@ -110,8 +110,9 @@ GEM
       activesupport (>= 2.3.2)
       cocaine (>= 0.0.2)
       mime-types
+    pg (0.14.1)
     polyglot (0.3.3)
-    rack (1.4.1)
+    rack (1.4.3)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-openid (1.3.1)
@@ -121,17 +122,17 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.8)
-      actionmailer (= 3.2.8)
-      actionpack (= 3.2.8)
-      activerecord (= 3.2.8)
-      activeresource (= 3.2.8)
-      activesupport (= 3.2.8)
+    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.8)
-    railties (3.2.8)
-      actionpack (= 3.2.8)
-      activesupport (= 3.2.8)
+      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)
@@ -152,8 +153,9 @@ GEM
       tilt (~> 1.3)
     sexp_processor (4.1.3)
     simple_oauth (0.1.9)
-    sprockets (2.1.3)
+    sprockets (2.2.2)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.6)
@@ -196,7 +198,8 @@ DEPENDENCIES
   omniauth-facebook
   omniauth-openid
   paperclip (~> 2.3)
-  rails (= 3.2.8)
+  pg
+  rails (= 3.2.11)
   rake
   redis
   redis-namespace

config/application.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../boot', __FILE__)
 require 'rails/all'
 
-Bundler.require(:default, Rails.env) if defined?(Bundler)
+Bundler.require(:default, :assets, Rails.env) if defined?(Bundler)
 
 module Nineminutes
   class Application < Rails::Application
@@ -14,13 +14,43 @@ module Nineminutes
     # asset packaging
     config.serve_static_assets = true
 
+    # Only load the plugins named here, in the order given (default is alphabetical).
+    # :all can be used as a placeholder for all plugins not explicitly named.
+    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
+
+    # Activate observers that should always be running.
+    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    config.time_zone = 'Vienna'
+    config.active_record.default_timezone = :local
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = 'de-AT'
+    # config.i18n.available_locales = 'de-AT'
+
+    # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"
 
+    # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
 
+    # Enforce whitelist mode for mass assignment.
+    # This will create an empty whitelist of attributes available for mass-assignment for all models
+    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
+    # parameters by using an attr_accessible or attr_protected declaration.
+    config.active_record.whitelist_attributes = true
+
+    # Enable the asset pipeline
     config.assets.enabled = true
+
+    # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
 
+    config.assets.initialize_on_precompile = false
+
     # Defaults to '/assets'
     # config.assets.prefix = '/asset-files'
   end

config/environments/production.rb

@@ -11,7 +11,7 @@ Nineminutes::Application.configure do
   config.action_controller.perform_caching = true
 
   # Specifies the header that your server uses for sending files
-  config.action_dispatch.x_sendfile_header = "X-Sendfile"
+  # config.action_dispatch.x_sendfile_header = "X-Sendfile"
 
   # For nginx:
   # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
@@ -61,7 +61,7 @@ Nineminutes::Application.configure do
   # config.assets.manifest = YOUR_PATH
 
   # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
-  # config.assets.precompile += %w( search.js )
+  # config.assets.precompile += %w()
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true

config/initializers/sass_config.rb

@@ -1,3 +0,0 @@
-output_style = ::Rails.env == "production" ? :compressed : :nested
-
-Sass::Plugin.options[:style] = output_style

config/routes.rb

@@ -15,20 +15,20 @@ Nineminutes::Application.routes.draw do
     get "/logout" => "devise_auth/sessions#destroy",      :as => :destroy_user_session
   end
 
-  match "/search_video", :to => "tracks#search_video"
+  get "/search_video", :to => "tracks#search_video"
 
   resources :artists, :only => [ :show ], :constraints => { :id => /.*/ }
-  match "/more_tracks", :to => "artists#more_tracks"
-  match "/more_albums", :to => "artists#more_albums"
-  match "/album_info", :to => "artists#album_info"
-  match "/favourize", :to => "artists#favourize"
+  get "/more_tracks", :to => "artists#more_tracks"
+  get "/more_albums", :to => "artists#more_albums"
+  get "/album_info", :to => "artists#album_info"
+  get "/favourize", :to => "artists#favourize"
 
   resources :search, :only => [ :show ], :constraints => { :id => /.*/ }
-  match "/more_artists", :to => "search#more_artists"
-  match "/autocomplete", :to => "search#autocomplete"
+  get "/more_artists", :to => "search#more_artists"
+  get "/autocomplete", :to => "search#autocomplete"
 
-  match "/more_charts", :to => "charts#more"
-  match "/charts", :to => "charts#index"
+  get "/more_charts", :to => "charts#more"
+  get "/charts", :to => "charts#index"
 
   resources :users, :only => [ :show, :update, :edit, :create ]