Merge branch 'master' into 214-delete-and-restore-branches

config/environments/staging.rb

@@ -0,0 +1,67 @@
+# -*- encoding : utf-8 -*-
+Rosa::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
+
+  # The production environment is meant for finished, "live" apps.
+  # Code is not reloaded between requests
+  config.cache_classes = true
+
+  # Full error reports are disabled and caching is turned on
+  config.consider_all_requests_local       = false
+  config.action_controller.perform_caching = true
+
+  # Specifies the header that your server uses for sending files
+#  config.action_dispatch.x_sendfile_header = "X-Sendfile"
+
+  # For nginx:
+  config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
+
+  # If you have no front-end server that supports something like X-Sendfile,
+  # just comment this out and Rails will serve the files
+
+  # See everything in the log (default is :info)
+  # config.log_level = :debug
+
+  # Use a different logger for distributed setups
+  # config.logger = SyslogLogger.new
+
+  # Use a different cache store in production
+  # config.cache_store = :mem_cache_store
+
+  # Disable Rails's static asset server
+  # In production, Apache or nginx will already do this
+  config.serve_static_assets = false
+
+  # Enable serving of images, stylesheets, and javascripts from an asset server
+  # config.action_controller.asset_host = "http://assets.example.com"
+
+  # Disable delivery errors, bad email addresses will be ignored
+  # config.action_mailer.raise_delivery_errors = false
+  config.action_mailer.default_url_options = { :host => 'abf.rosalinux.ru' }
+  config.delivery_method = :sendmail
+
+  # Enable threaded mode
+  # config.threadsafe!
+
+  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+  # the I18n.default_locale when a translation can not be found)
+  config.i18n.fallbacks = true
+
+  # Send deprecation notices to registered listeners
+  config.active_support.deprecation = :notify
+
+  # Force SSL
+  # config.force_ssl = true
+
+  # Compress JavaScripts and CSS
+  config.assets.compress = true
+
+  # Don't fallback to assets pipeline if a precompiled asset is missed
+  config.assets.compile = false
+
+  # Generate digests for assets URLs
+  config.assets.digest = true
+
+  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
+  config.assets.precompile += %w(login.css login.js reg_session.css tour.css tour.js gollum/editor/langs/*.js)
+end

db/migrate/20130717112337_add_index_to_relation.rb

@@ -0,0 +1,6 @@
+class AddIndexToRelation < ActiveRecord::Migration
+  def change
+    add_index :relations, [:actor_type, :actor_id]
+    add_index :relations, [:target_type, :target_id]
+  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 => 20130701121313) do
+ActiveRecord::Schema.define(:version => 20130717112337) do
 
   create_table "activity_feeds", :force => true do |t|
     t.integer  "user_id",    :null => false
@@ -450,6 +450,9 @@ ActiveRecord::Schema.define(:version => 20130701121313) do
     t.string   "role"
   end
 
+  add_index "relations", ["actor_type", "actor_id"], :name => "index_relations_on_actor_type_and_actor_id"
+  add_index "relations", ["target_type", "target_id"], :name => "index_relations_on_target_type_and_target_id"
+
   create_table "repositories", :force => true do |t|
     t.string   "description",                          :null => false
     t.integer  "platform_id",                          :null => false