Merge remote-tracking branch 'upstream/rails3' into twitter-bootstrap

Conflicts:
	Gemfile

.gitignore

@@ -9,4 +9,5 @@ capfile
 public/**/*_cached.*
 .idea
 .get-dump.yml
-.sass-cache/
+.sass-cache/
+doc/app/

Gemfile

@@ -18,6 +18,7 @@ end
 gem 'jquery-rails'
 
 gem 'mysql2'
+gem 'sqlite3', :group => :development
 gem 'prawn'
 gem 'haml-rails'
 gem 'kaminari'
@@ -36,4 +37,4 @@ gem 'meta_search'
 
 group :production do
   gem 'exception_notification', :require => 'exception_notifier'
-end
+end

Gemfile.lock

@@ -153,6 +153,7 @@ GEM
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.6)
     therubyracer (0.10.2)
       libv8 (~> 3.3.10)
     thor (0.16.0)
@@ -197,6 +198,7 @@ DEPENDENCIES
   simple-navigation
   simple-navigation-bootstrap
   simple_form
+  sqlite3
   therubyracer
   twitter-bootstrap-rails
   uglifier (>= 1.0.3)

app/views/messages/new.haml

@@ -37,10 +37,10 @@
 
   #recipients
     = f.input :recipient_tokens, :input_html => { 'data-pre' => User.find_all_by_id(@message.recipients_ids).map { |u| u.token_attributes }.to_json }
-    = f.input :group_id, :as => :select, :collection => Group.order('type DESC, name DESC').all.reject { |g| g.memberships.empty? }
+    = f.input :group_id, :as => :select, :collection => Group.order('type DESC, name ASC').all.reject { |g| g.memberships.empty? }
   = f.input :private
   = f.input :subject, input_html: {class: 'input-xxlarge'}
   = f.input :body, input_html: {class: 'input-xxlarge'}
   .form-actions
     = f.submit
-    = link_to 'oder abbrechen', :back
+    = link_to 'oder abbrechen', :back

doc/README_FOR_APP

@@ -1,5 +1,5 @@
 Use this README file to introduce your application and point to useful places in the API for learning more.
-Run "rake appdoc" to generate API documentation for your models and controllers.
+Run "rake doc:app" to generate API documentation for your models and controllers.
 
 = The Foodsoft