update configs for rails 4.1

- use secrets.yml - use Rails.application over Errbit::Application - do not use secret_token.rb - update devise initializer

update configs for rails 4.1
- use secrets.yml - use Rails.application over Errbit::Application - do not use secret_token.rb - update devise initializer
Chulki Lee
1 parent 19066a58
Showing 25 changed files with 210 additions and 195 deletions Show diff stats
Gemfile
Rakefile
config.ru
config/application.rb
config/boot.rb
config/cloud/cloud66/deploy_hooks.yml
config/cloud/cloud66/files/secret_token.rb
config/deploy.example.rb
config/environment.rb
config/environments/development.rb
config/environments/production.rb
config/environments/test.rb
config/initializers/assets.rb
config/initializers/backtrace_silencers.rb
config/initializers/cookies_serializer.rb
config/initializers/devise.rb
config/initializers/filter_parameter_logging.rb
config/initializers/inflections.rb
config/initializers/mime_types.rb
config/initializers/secret_token.rb
@@ -24,7 +24,7 @@ gem &#39;rails_autolink&#39;
 # Please don't update hoptoad_notifier to airbrake.
 # It's for internal use only, and we monkeypatch certain methods
 gem 'hoptoad_notifier', "~> 2.4"
-gem 'draper', :require => false
+gem 'draper'
 gem 'errbit_plugin', github: 'errbit/errbit_plugin'
 gem 'errbit_github_plugin', github: 'errbit/errbit_github_plugin'
-#!/usr/bin/env rake
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 require File.expand_path('../config/application', __FILE__)
-Errbit::Application.load_tasks
+Rails.application.load_tasks
 begin
   require 'rspec/core/rake_task'
@@ -2,4 +2,4 @@
 require ::File.expand_path('../config/environment',  __FILE__)
 use Rack::Deflater
-run Errbit::Application
+run Rails.application
@@ -5,8 +5,8 @@ require &quot;action_mailer/railtie&quot;
 require 'mongoid/railtie'
 require "sprockets/railtie"
-require 'draper'
-
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
 Bundler.require(*Rails.groups)
 module Errbit
@@ -18,10 +18,6 @@ module Errbit
     # Custom directories with classes and modules you want to be autoloadable.
     config.autoload_paths += [Rails.root.join('lib')]
-    # 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 ]
-
     # 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 = 'Central Time (US & Canada)'
@@ -41,23 +37,7 @@ module Errbit
     # IssueTracker subclasses use inheritance, so preloading models provides querying consistency in dev mode.
     config.mongoid.preload_models = true
-    # 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]
-
     # Configure Devise mailer to use our mailer layout.
     config.to_prepare { Devise::Mailer.layout "mailer" }
-
-
-    # Enable the asset pipeline
-    config.assets.enabled = true
-
-    # Need to initialize Rails environment for issue_tracker_icons.css.erb
-    config.assets.initialize_on_precompile = true
-
-    # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.0'
   end
 end
-require 'rubygems'
-
 # Set up gems listed in the Gemfile.
-gemfile = File.expand_path('../../Gemfile', __FILE__)
-begin
-  ENV['BUNDLE_GEMFILE'] = gemfile
-  require 'bundler'
-  Bundler.setup
-rescue Bundler::GemNotFound => e
-  STDERR.puts e.message
-  STDERR.puts "Try running `bundle install`."
-  exit!
-end if File.exist?(gemfile)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
@@ -16,10 +16,6 @@ production:
         destination: <%= ENV['RAILS_STACK_PATH'] %>/config/mongoid.yml
         target: rails
         run_on: all_servers
-      - source: /config/cloud/cloud66/files/secret_token.rb
-        destination: <%= ENV['RAILS_STACK_PATH'] %>/config/initializers/secret_token.rb
-        target: rails
-        run_on: all_servers
       - source: /config/cloud/cloud66/files/seeds.rb
         destination: <%= ENV['RAILS_STACK_PATH'] %>/db/seeds.rb
         target: rails
@@ -59,10 +55,6 @@ staging:
         destination: <%= ENV['RAILS_STACK_PATH'] %>/config/mongoid.yml
         target: rails
         run_on: all_servers
-      - source: /config/cloud/cloud66/files/secret_token.rb
-        destination: <%= ENV['RAILS_STACK_PATH'] %>/config/initializers/secret_token.rb
-        target: rails
-        run_on: all_servers
       - source: /config/cloud/cloud66/files/seeds.rb
         destination: <%= ENV['RAILS_STACK_PATH'] %>/db/seeds.rb
         target: rails
@@ -103,10 +95,6 @@ development:
         destination: <%= ENV['RAILS_STACK_PATH'] %>/config/mongoid.yml
         target: rails
         run_on: all_servers
-      - source: /config/cloud/cloud66/files/secret_token.rb
-        destination: <%= ENV['RAILS_STACK_PATH'] %>/config/initializers/secret_token.rb
-        target: rails
-        run_on: all_servers
       - source: /config/cloud/cloud66/files/seeds.rb
         destination: <%= ENV['RAILS_STACK_PATH'] %>/db/seeds.rb
         target: rails
@@ -1,2 +0,0 @@
-Errbit::Application.config.secret_token = '<%= ENV['SECRET_TOKEN'] %>'
-Devise.secret_key = Errbit::Application.config.secret_token
@@ -23,7 +23,6 @@ set :linked_files, fetch(:linked_files, []) + %w(
   config/config.yml
   config/mongoid.yml
   config/newrelic.yml
-  config/initializers/secret_token.rb
 )
 set :linked_dirs, fetch(:linked_dirs, []) + %w(
-# Load the rails application
+# Load the Rails application.
 require File.expand_path('../application', __FILE__)
-# Initialize the rails application
-Errbit::Application.initialize!
+# Initialize the Rails application.
+Rails.application.initialize!
-Errbit::Application.configure do
-  # Settings specified here will take precedence over those in config/environment.rb
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
   # In the development environment your application's code is reloaded on
-  # every request.  This slows down response time but is perfect for development
-  # since you don't have to restart the webserver when you make code changes.
+  # every request. This slows down response time but is perfect for development
+  # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
+  # Do not eager load code on boot.
   config.eager_load = false
-  # Show full error reports and disable caching
+  # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
-  # Don't care if the mailer can't send
+  # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
-  config.action_mailer.default_url_options = { :host => 'localhost:3000' }
-  # Print deprecation notices to the Rails logger
+  # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
-  # Do not compress assets
-  config.assets.compress = false
+  # Raise an error on page load if there are pending migrations.
+  # config.active_record.migration_error = :page_load
-  # Expands the lines which load the assets
+  # Debug mode disables concatenation and preprocessing of assets.
+  # This option may cause significant delays in view rendering with a large
+  # number of complex assets.
   config.assets.debug = true
-end
+  # Adds additional error checking when serving assets at runtime.
+  # Checks for improperly declared sprockets dependencies.
+  # Raises helpful error messages.
+  config.assets.raise_runtime_errors = false
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
+end
-Errbit::Application.configure do
-  # Settings specified here will take precedence over those in config/environment.rb
+Rails.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
+  # Code is not reloaded between requests.
   config.cache_classes = true
+  # Eager load code on boot. This eager loads most of Rails and
+  # your application in memory, allowing both threaded web servers
+  # and those relying on copy on write to perform better.
+  # Rake tasks automatically ignore this option for performance.
   config.eager_load = true
-  # Shows or hides all error details if something goes wrong inside Errbit
+  # Full error reports are disabled and caching is turned on.
   config.consider_all_requests_local       = false
-  # Caching is turned on
   config.action_controller.perform_caching = true
-  # Specifies the header that your server uses for sending files
-  config.action_dispatch.x_sendfile_header = "X-Sendfile"
+  # Enable Rack::Cache to put a simple HTTP cache in front of your application
+  # Add `rack-cache` to your Gemfile before enabling this.
+  # For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid.
+  # config.action_dispatch.rack_cache = true
-  # For nginx:
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
+  # Disable Rails's static asset server (Apache or nginx will already do this).
+  config.serve_static_assets = false
-  # If you have no front-end server that supports something like X-Sendfile,
-  # just comment this out and Rails will serve the files
+  # Compress JavaScripts and CSS.
+  config.assets.js_compressor = :uglifier
+  # config.assets.css_compressor = :sass
-  # See everything in the log (default is :info)
-  # config.log_level = :debug
+  # Do not fallback to assets pipeline if a precompiled asset is missed.
+  config.assets.compile = false
-  # Use a different logger for distributed setups
-  # config.logger = SyslogLogger.new
+  # Generate digests for assets URLs.
+  config.assets.digest = true
-  # Use a different cache store in production
-  # config.cache_store = :mem_cache_store
+  # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
-  # Disable Rails's static asset server
-  # In production, Apache or nginx will already do this
-  config.serve_static_assets = false
+  # Specifies the header that your server uses for sending files.
+  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
-  # Compress JavaScripts and CSS
-  config.assets.compress = true
+  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+  # config.force_ssl = true
-  # Don't fallback to assets pipeline if a precompiled asset is missed
-  config.assets.compile = false
+  # Set to :debug to see everything in the log.
+  config.log_level = :info
-  # Generate digests for assets URLs
-  config.assets.digest = true
+  # Prepend all log lines with the following tags.
+  # config.log_tags = [ :subdomain, :uuid ]
-  # Enable serving of images, stylesheets, and javascripts from an asset server
-  # config.action_controller.asset_host = "http://assets.example.com"
+  # Use a different logger for distributed setups.
+  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
-  # Disable delivery errors, bad email addresses will be ignored
-  # config.action_mailer.raise_delivery_errors = false
+  # Use a different cache store in production.
+  # config.cache_store = :mem_cache_store
-  # Set default host for ActionMailer links
-  config.action_mailer.default_url_options = { :host => ENV['ERRBIT_HOST'] } if ENV['ERRBIT_HOST']
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
+  # config.action_controller.asset_host = "http://assets.example.com"
-  # Enable threaded mode
-  # config.threadsafe!
+  # Ignore bad email addresses and do not raise email delivery errors.
+  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
+  # config.action_mailer.raise_delivery_errors = false
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation can not be found)
+  # the I18n.default_locale when a translation cannot be found).
   config.i18n.fallbacks = true
-  # Send deprecation notices to registered listeners
+  # Send deprecation notices to registered listeners.
   config.active_support.deprecation = :notify
-  config.static_cache_control = "public, max-age=7200"
-end
+  # Disable automatic flushing of the log to improve performance.
+  # config.autoflush_log = false
+
+  # Use default logging formatter so that PID and timestamp are not suppressed.
+  config.log_formatter = ::Logger::Formatter.new
+
+  # Do not dump schema after migrations.
+  # config.active_record.dump_schema_after_migration = false
+end
-Errbit::Application.configure do
-  # Settings specified here will take precedence over those in config/environment.rb
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
   # The test environment is used exclusively to run your application's
-  # test suite.  You never need to work with it otherwise.  Remember that
+  # test suite. You never need to work with it otherwise. Remember that
   # your test database is "scratch space" for the test suite and is wiped
-  # and recreated between test runs.  Don't rely on the data there!
+  # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
   config.eager_load = false
-  # Show full error reports and disable caching
+  # Configure static asset server for tests with Cache-Control for performance.
+  config.serve_static_assets  = true
+  config.static_cache_control = 'public, max-age=3600'
+
+  # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
-  # Raise exceptions instead of rendering exception templates
+  # Raise exceptions instead of rendering exception templates.
   config.action_dispatch.show_exceptions = false
-  # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
+  # Disable request forgery protection in test environment.
+  config.action_controller.allow_forgery_protection = false
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
-  config.action_mailer.default_url_options = { :host => 'test.host' }
-
-  # Use SQL instead of Active Record's schema dumper when creating the test database.
-  # This is necessary if your schema can't be completely dumped by the schema dumper,
-  # like if you have constraints or database-specific column types
-  # config.active_record.schema_format = :sql
-  # Print deprecation notices to the stderr
+  # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
-end
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
+end
@@ -0,0 +1,11 @@
+# Be sure to restart your server when you modify this file.
+
+# Version of your assets, change this if you want to expire all your assets.
+Rails.application.config.assets.version = '1.0'
+
+# Precompile additional assets.
+# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
+# Rails.application.config.assets.precompile += %w( search.js )
+
+# Need to initialize Rails environment for issue_tracker_icons.css.erb
+Rails.application.config.assets.initialize_on_precompile = true
@@ -5,4 +5,3 @@
 # You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
 # Rails.backtrace_cleaner.remove_silencers!
-
@@ -0,0 +1,3 @@
+# Be sure to restart your server when you modify this file.
+
+Rails.application.config.action_dispatch.cookies_serializer = :hybrid
 # Use this hook to configure devise mailer, warden hooks and so forth.
 # Many of these configuration options can be set straight in your model.
 Devise.setup do |config|
+  # The secret key used by Devise. Devise uses this key to generate
+  # random tokens. Changing this key will render invalid all existing
+  # confirmation, reset password and unlock tokens in the database.
+  # config.secret_key = '2970917daf24e79762e7f370c2121b17417d729bdc587874c769b298a580824ff79b4cfd8ad6f3da94c6bbd1d5e12b483dbd2fd78b343777adc1fd15692dbcb2'
+
   # ==> Mailer Configuration
   # Configure the e-mail address which will be shown in Devise::Mailer,
-  # note that it will be overwritten if you use your own mailer class with default "from" parameter.
+  # note that it will be overwritten if you use your own mailer class
+  # with default "from" parameter.
   config.mailer_sender = Errbit::Config.email_from
   # Configure the class responsible to send e-mails.
-  # config.mailer = "Devise::Mailer"
+  # config.mailer = 'Devise::Mailer'
   # ==> ORM configuration
   # Load and configure the ORM. Supports :active_record (default) and
@@ -50,19 +56,16 @@ Devise.setup do |config|
   # Tell if authentication through HTTP Auth is enabled. False by default.
   # It can be set to an array that will enable http authentication only for the
-  # given strategies, for example, `config.http_authenticatable = [:token]` will
-  # enable it only for token authentication. The supported strategies are:
+  # given strategies, for example, `config.http_authenticatable = [:database]` will
+  # enable it only for database authentication. The supported strategies are:
   # :database      = Support basic authentication with authentication key + password
-  # :token         = Support basic authentication with token authentication key
-  # :token_options = Support token authentication with options as defined in
-  #                  http://api.rubyonrails.org/classes/ActionController/HttpAuthentication/Token.html
   # config.http_authenticatable = false
-  # If http headers should be returned for AJAX requests. True by default.
+  # If 401 status code should be returned for AJAX requests. True by default.
   # config.http_authenticatable_on_xhr = true
-  # The realm used in Http Basic Authentication. "Application" by default.
-  # config.http_authentication_realm = "Application"
+  # The realm used in Http Basic Authentication. 'Application' by default.
+  # config.http_authentication_realm = 'Application'
   # It will change confirmation, password recovery and other workflows
   # to behave the same regardless if the e-mail provided was right or wrong.
@@ -70,30 +73,38 @@ Devise.setup do |config|
   # config.paranoid = true
   # By default Devise will store the user in session. You can skip storage for
-  # :http_auth and :token_auth by adding those symbols to the array below.
+  # particular strategies by setting this option.
   # Notice that if you are skipping storage for all authentication paths, you
   # may want to disable generating routes to Devise's sessions controller by
-  # passing :skip => :sessions to `devise_for` in your config/routes.rb
+  # passing skip: :sessions to `devise_for` in your config/routes.rb
   config.skip_session_storage = [:http_auth]
+  # By default, Devise cleans up the CSRF token on authentication to
+  # avoid CSRF token fixation attacks. This means that, when using AJAX
+  # requests for sign in and sign up, you need to get a new CSRF token
+  # from the server. You can disable this option at your own risk.
+  # config.clean_up_csrf_token_on_authentication = true
+
   # ==> Configuration for :database_authenticatable
   # For bcrypt, this is the cost for hashing the password and defaults to 10. If
   # using other encryptors, it sets how many times you want the password re-encrypted.
   #
   # Limiting the stretches to just one in testing will increase the performance of
   # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
-  # a value less than 10 in other environments.
+  # a value less than 10 in other environments. Note that, for bcrypt (the default
+  # encryptor), the cost increases exponentially with the number of stretches (e.g.
+  # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation).
   config.stretches = Rails.env.test? ? 1 : 10
   # Setup a pepper to generate the encrypted password.
-  config.pepper = "425f10f555c1a4718aff3370ef9dd2d97a21622beb0400fde6b52177375ddcbe37a2dac6af9bca835c988e00c32887ee940ba111a78eab48234d8799936d36b9"
+  config.pepper = '425f10f555c1a4718aff3370ef9dd2d97a21622beb0400fde6b52177375ddcbe37a2dac6af9bca835c988e00c32887ee940ba111a78eab48234d8799936d36b9'
   # ==> Configuration for :confirmable
   # A period that the user is allowed to access the website even without
-  # confirming his account. For instance, if set to 2.days, the user will be
-  # able to access the website for two days without confirming his account,
+  # confirming their account. For instance, if set to 2.days, the user will be
+  # able to access the website for two days without confirming their account,
   # access will be blocked just in the third day. Default is 0.days, meaning
-  # the user cannot access the website without confirming his account.
+  # the user cannot access the website without confirming their account.
   # config.allow_unconfirmed_access_for = 2.days
   # A period that the user is allowed to confirm their account before their
@@ -106,8 +117,8 @@ Devise.setup do |config|
   # If true, requires any email changes to be confirmed (exactly the same way as
   # initial account confirmation) to be applied. Requires additional unconfirmed_email
-  # db field (see migrations). Until confirmed new email is stored in
-  # unconfirmed email column, and copied to email column on successful confirmation.
+  # db field (see migrations). Until confirmed, new email is stored in
+  # unconfirmed_email column, and copied to email column on successful confirmation.
   config.reconfirmable = true
   # Defines which key will be used when confirming an account
@@ -117,15 +128,18 @@ Devise.setup do |config|
   # The time the user will be remembered without asking for credentials again.
   config.remember_for = 2.weeks
+  # Invalidates all the remember me tokens when the user signs out.
+  config.expire_all_remember_me_on_sign_out = true
+
   # If true, extends the user's remember period when remembered via cookie.
   # config.extend_remember_period = false
   # Options to be passed to the created cookie. For instance, you can set
-  # :secure => true in order to force SSL only cookies.
+  # secure: true in order to force SSL only cookies.
   # config.rememberable_options = {}
   # ==> Configuration for :validatable
-  # Range for password length. Default is 8..128.
+  # Range for password length.
   config.password_length = 6..1024
   # Email regex used to validate email formats. It simply asserts that
@@ -165,6 +179,9 @@ Devise.setup do |config|
   # Time interval to unlock the account if :time is enabled as unlock_strategy.
   # config.unlock_in = 1.hour
+  # Warn on the last attempt before the account is locked.
+  # config.last_attempt_warning = true
+
   # ==> Configuration for :recoverable
   #
   # Defines which key will be used when recovering the password for an account
@@ -208,7 +225,7 @@ Devise.setup do |config|
   # should add them to the navigational formats lists.
   #
   # The "*/*" below is required to match Internet Explorer requests.
-  # config.navigational_formats = ["*/*", :html]
+  # config.navigational_formats = ['*/*', :html]
   # The default HTTP method used to sign out a resource. Default is :delete.
   config.sign_out_via = :delete
@@ -216,7 +233,7 @@ Devise.setup do |config|
   # ==> OmniAuth
   # Add a new OmniAuth provider. Check the wiki for more information on setting
   # up on your models and hooks.
-  # config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'
+  # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
   if Errbit::Config.github_authentication || Rails.env.test?
     config.omniauth :github,
@@ -232,7 +249,7 @@ Devise.setup do |config|
   #
   # config.warden do |manager|
   #   manager.intercept_401 = false
-  #   manager.default_strategies(:scope => :user).unshift :some_external_strategy
+  #   manager.default_strategies(scope: :user).unshift :some_external_strategy
   # end
   # ==> Mountable engine configurations
@@ -240,12 +257,12 @@ Devise.setup do |config|
   # is mountable, there are some extra configurations to be taken into account.
   # The following options are available, assuming the engine is mounted as:
   #
-  #     mount MyEngine, at: "/my_engine"
+  #     mount MyEngine, at: '/my_engine'
   #
   # The router that invoked `devise_for`, in the example above, would be:
   # config.router_name = :my_engine
   #
   # When using omniauth, Devise cannot automatically set Omniauth path,
   # so you need to do it manually. For the users scope, it would be:
-  # config.omniauth_path_prefix = "/my_engine/users/auth"
+  # config.omniauth_path_prefix = '/my_engine/users/auth'
 end
@@ -0,0 +1,4 @@
+# Be sure to restart your server when you modify this file.
+
+# Configure sensitive parameters which will be filtered from the log file.
+Rails.application.config.filter_parameters += [:password]
 # Be sure to restart your server when you modify this file.
-# Add new inflection rules using the following format
-# (all these examples are active by default):
-# ActiveSupport::Inflector.inflections do |inflect|
+# Add new inflection rules using the following format. Inflections
+# are locale specific, and you may define rules for as many different
+# locales as you wish. All of these examples are active by default:
+# ActiveSupport::Inflector.inflections(:en) do |inflect|
 #   inflect.plural /^(ox)$/i, '\1en'
 #   inflect.singular /^(ox)en/i, '\1'
 #   inflect.irregular 'person', 'people'
 #   inflect.uncountable %w( fish sheep )
 # end
+# These inflection rules are supported but not enabled by default:
+# ActiveSupport::Inflector.inflections(:en) do |inflect|
+#   inflect.acronym 'RESTful'
+# end
@@ -2,5 +2,3 @@
 # Add new mime types for use in respond_to blocks:
 # Mime::Type.register "text/richtext", :rtf
-# Mime::Type.register_alias "text/html", :iphone
-
@@ -1,35 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Your secret key for verifying the integrity of signed cookies.
-# If you change this key, all old signed cookies will become invalid!
-# Make sure the secret is at least 30 characters and all random,
-# no regular words or you'll be exposed to dictionary attacks.
-
-# Everyone can share the same token for development/test
-if ENV['SECRET_TOKEN'].present?
-  Errbit::Application.config.secret_token = ENV['SECRET_TOKEN']
-
-  # Do not raise an error if secret token is not available during assets precompilation
-elsif %w(development test).include?(Rails.env) || ENV['RAILS_GROUPS'] == 'assets'
-  Errbit::Application.config.secret_token = 'f258ed69266dc8ad0ca79363c3d2f945c388a9c5920fc9a1ae99a98fbb619f135001c6434849b625884a9405a60cd3d50fc3e3b07ecd38cbed7406a4fccdb59c'
-elsif !Errbit::Application.config.secret_token
-  raise <<-ERROR
-
-  You must generate a unique secret token for your Errbit instance.
-
-  If you are deploying via capistrano, please ensure that your `config/deploy.rb` contains
-  the new `errbit:setup_configs` and `errbit:symlink_configs` tasks from `config/deploy.example.rb`.
-  Next time you deploy, your secret token will be automatically generated.
-
-  If you are deploying to Heroku, please run the following command to set your secret token:
-      heroku config:add SECRET_TOKEN="$(bundle exec rake secret)"
-
-  If you are deploying in some other way, please run the following command to generate a new secret token,
-  and commit the new `config/initializers/__secret_token.rb`:
-
-      echo "Errbit::Application.config.secret_token = '$(bundle exec rake secret)'" > config/initializers/__secret_token.rb
-
-  ERROR
-end
-
-Devise.secret_key = Errbit::Application.config.secret_token
 # Be sure to restart your server when you modify this file.
-Errbit::Application.config.session_store :cookie_store, :key => '_errbit_session'
+Rails.application.config.session_store :cookie_store, key: '_errbit_session'
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information
 # (create the session table with "rake db:sessions:create")
-# Errbit::Application.config.session_store :active_record_store
-
+# Rails.application.config.session_store :active_record_store
@@ -2,7 +2,7 @@
 if Errbit::Config.enforce_ssl
   require 'rack/ssl-enforcer'
   ActionMailer::Base.default_url_options.merge!(:protocol => 'https://')
-  Errbit::Application.configure do
+  Rails.application.configure do
     config.middleware.use Rack::SslEnforcer, :except => /^\/deploys/
   end
 end
@@ -0,0 +1,14 @@
+# Be sure to restart your server when you modify this file.
+
+# This file contains settings for ActionController::ParamsWrapper which
+# is enabled by default.
+
+# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
+ActiveSupport.on_load(:action_controller) do
+  wrap_parameters format: [:json] if respond_to?(:wrap_parameters)
+end
+
+# To enable root element in JSON for ActiveRecord objects.
+# ActiveSupport.on_load(:active_record) do
+#  self.include_root_in_json = true
+# end
-Errbit::Application.routes.draw do
+Rails.application.routes.draw do
   devise_for :users, :controllers => { :omniauth_callbacks => "users/omniauth_callbacks" }
@@ -0,0 +1,22 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key is used for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+# You can use `rake secret` to generate a secure secret key.
+
+# Make sure the secrets in this file are kept private
+# if you're sharing your code publicly.
+
+development:
+  secret_key_base: f258ed69266dc8ad0ca79363c3d2f945c388a9c5920fc9a1ae99a98fbb619f135001c6434849b625884a9405a60cd3d50fc3e3b07ecd38cbed7406a4fccdb59c
+
+test:
+  secret_key_base: f258ed69266dc8ad0ca79363c3d2f945c388a9c5920fc9a1ae99a98fbb619f135001c6434849b625884a9405a60cd3d50fc3e3b07ecd38cbed7406a4fccdb59c
+
+# Do not keep production secrets in the repository,
+# instead read values from the environment.
+production:
+  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
	@@ -24,7 +24,7 @@ gem 'rails_autolink'		@@ -24,7 +24,7 @@ gem 'rails_autolink'
24	# Please don't update hoptoad_notifier to airbrake.	24	# Please don't update hoptoad_notifier to airbrake.
25	# It's for internal use only, and we monkeypatch certain methods	25	# It's for internal use only, and we monkeypatch certain methods
26	gem 'hoptoad_notifier', "~> 2.4"	26	gem 'hoptoad_notifier', "~> 2.4"
27	-gem 'draper', :require => false	27	+gem 'draper'
28		28
29	gem 'errbit_plugin', github: 'errbit/errbit_plugin'	29	gem 'errbit_plugin', github: 'errbit/errbit_plugin'
30	gem 'errbit_github_plugin', github: 'errbit/errbit_github_plugin'	30	gem 'errbit_github_plugin', github: 'errbit/errbit_github_plugin'
1	-#!/usr/bin/env rake
2	# Add your own tasks in files placed in lib/tasks ending in .rake,	1	# Add your own tasks in files placed in lib/tasks ending in .rake,
3	# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.	2	# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
4		3
5	require File.expand_path('../config/application', __FILE__)	4	require File.expand_path('../config/application', __FILE__)
6		5
7	-Errbit::Application.load_tasks	6	+Rails.application.load_tasks
8		7
9	begin	8	begin
10	require 'rspec/core/rake_task'	9	require 'rspec/core/rake_task'
	@@ -2,4 +2,4 @@		@@ -2,4 +2,4 @@
2		2
3	require ::File.expand_path('../config/environment', __FILE__)	3	require ::File.expand_path('../config/environment', __FILE__)
4	use Rack::Deflater	4	use Rack::Deflater
5	-run Errbit::Application	5	+run Rails.application
	@@ -5,8 +5,8 @@ require "action_mailer/railtie"		@@ -5,8 +5,8 @@ require "action_mailer/railtie"
5	require 'mongoid/railtie'	5	require 'mongoid/railtie'
6	require "sprockets/railtie"	6	require "sprockets/railtie"
7		7
8	-require 'draper'
9	-	8	+# Require the gems listed in Gemfile, including any gems
		9	+# you've limited to :test, :development, or :production.
10	Bundler.require(*Rails.groups)	10	Bundler.require(*Rails.groups)
11		11
12	module Errbit	12	module Errbit
	@@ -18,10 +18,6 @@ module Errbit		@@ -18,10 +18,6 @@ module Errbit
18	# Custom directories with classes and modules you want to be autoloadable.	18	# Custom directories with classes and modules you want to be autoloadable.
19	config.autoload_paths += [Rails.root.join('lib')]	19	config.autoload_paths += [Rails.root.join('lib')]
20		20
21	- # Only load the plugins named here, in the order given (default is alphabetical).
22	- # :all can be used as a placeholder for all plugins not explicitly named.
23	- # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
24	-
25	# Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.	21	# Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
26	# Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.	22	# Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
27	# config.time_zone = 'Central Time (US & Canada)'	23	# config.time_zone = 'Central Time (US & Canada)'
	@@ -41,23 +37,7 @@ module Errbit		@@ -41,23 +37,7 @@ module Errbit
41	# IssueTracker subclasses use inheritance, so preloading models provides querying consistency in dev mode.	37	# IssueTracker subclasses use inheritance, so preloading models provides querying consistency in dev mode.
42	config.mongoid.preload_models = true	38	config.mongoid.preload_models = true
43		39
44	- # Configure the default encoding used in templates for Ruby 1.9.
45	- config.encoding = "utf-8"
46	-
47	- # Configure sensitive parameters which will be filtered from the log file.
48	- config.filter_parameters += [:password]
49	-
50	# Configure Devise mailer to use our mailer layout.	40	# Configure Devise mailer to use our mailer layout.
51	config.to_prepare { Devise::Mailer.layout "mailer" }	41	config.to_prepare { Devise::Mailer.layout "mailer" }
52	-
53	-
54	- # Enable the asset pipeline
55	- config.assets.enabled = true
56	-
57	- # Need to initialize Rails environment for issue_tracker_icons.css.erb
58	- config.assets.initialize_on_precompile = true
59	-
60	- # Version of your assets, change this if you want to expire all your assets
61	- config.assets.version = '1.0'
62	end	42	end
63	end	43	end
1	-require 'rubygems'
2	-
3	# Set up gems listed in the Gemfile.	1	# Set up gems listed in the Gemfile.
4	-gemfile = File.expand_path('../../Gemfile', __FILE__)
5	-begin
6	- ENV['BUNDLE_GEMFILE'] = gemfile
7	- require 'bundler'
8	- Bundler.setup
9	-rescue Bundler::GemNotFound => e
10	- STDERR.puts e.message
11	- STDERR.puts "Try running `bundle install`."
12	- exit!
13	-end if File.exist?(gemfile)	2	+ENV['BUNDLE_GEMFILE'] \|\|= File.expand_path('../../Gemfile', __FILE__)
14		3
		4	+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
	@@ -1,2 +0,0 @@	@@ -1,2 +0,0 @@
1	-Errbit::Application.config.secret_token = '<%= ENV['SECRET_TOKEN'] %>'
2	-Devise.secret_key = Errbit::Application.config.secret_token
	@@ -23,7 +23,6 @@ set :linked_files, fetch(:linked_files, []) + %w(		@@ -23,7 +23,6 @@ set :linked_files, fetch(:linked_files, []) + %w(
23	config/config.yml	23	config/config.yml
24	config/mongoid.yml	24	config/mongoid.yml
25	config/newrelic.yml	25	config/newrelic.yml
26	- config/initializers/secret_token.rb
27	)	26	)
28		27
29	set :linked_dirs, fetch(:linked_dirs, []) + %w(	28	set :linked_dirs, fetch(:linked_dirs, []) + %w(
1	-# Load the rails application	1	+# Load the Rails application.
2	require File.expand_path('../application', __FILE__)	2	require File.expand_path('../application', __FILE__)
3		3
4	-# Initialize the rails application
5	-Errbit::Application.initialize!	4	+# Initialize the Rails application.
		5	+Rails.application.initialize!
@@ -0,0 +1,11 @@		@@ -0,0 +1,11 @@
	1	+# Be sure to restart your server when you modify this file.
	2	+
	3	+# Version of your assets, change this if you want to expire all your assets.
	4	+Rails.application.config.assets.version = '1.0'
	5	+
	6	+# Precompile additional assets.
	7	+# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
	8	+# Rails.application.config.assets.precompile += %w( search.js )
	9	+
	10	+# Need to initialize Rails environment for issue_tracker_icons.css.erb
	11	+Rails.application.config.assets.initialize_on_precompile = true
	@@ -5,4 +5,3 @@		@@ -5,4 +5,3 @@
5		5
6	# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.	6	# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
7	# Rails.backtrace_cleaner.remove_silencers!	7	# Rails.backtrace_cleaner.remove_silencers!
8	-