forgot the removal of the middleware&the comment in application.rb

pull/490/head
Stefan Frank 11 years ago
parent ea4615d66a
commit 51e77a9883
  1. 2
      Gemfile
  2. 2
      Gemfile.lock
  3. 5
      config/application.rb

@ -39,6 +39,8 @@ gem "fastercsv", "~> 1.5.0", :platforms => [:ruby_18, :jruby, :mingw_18]
gem 'globalize3', :git => 'https://github.com/svenfuchs/globalize3.git' gem 'globalize3', :git => 'https://github.com/svenfuchs/globalize3.git'
gem "delayed_job_active_record" # that's how delayed job's readme recommends it gem "delayed_job_active_record" # that's how delayed job's readme recommends it
gem 'request_store'
# TODO: adds #auto_link which was deprecated in rails 3.1 # TODO: adds #auto_link which was deprecated in rails 3.1
gem 'rails_autolink' gem 'rails_autolink'
gem "will_paginate", '~> 3.0' gem "will_paginate", '~> 3.0'

@ -262,6 +262,7 @@ GEM
rdoc (3.12.2) rdoc (3.12.2)
json (~> 1.4) json (~> 1.4)
ref (1.0.5) ref (1.0.5)
request_store (1.0.5)
rmagick (2.13.2) rmagick (2.13.2)
rspec (2.13.0) rspec (2.13.0)
rspec-core (~> 2.13.0) rspec-core (~> 2.13.0)
@ -408,6 +409,7 @@ DEPENDENCIES
rb-fsevent rb-fsevent
rb-readline rb-readline
rdoc (>= 2.4.2) rdoc (>= 2.4.2)
request_store
rmagick (>= 1.15.17) rmagick (>= 1.15.17)
rspec (~> 2.0) rspec (~> 2.0)
rspec-example_disabler rspec-example_disabler

@ -86,11 +86,6 @@ module OpenProject
# automatically compile translations.js # automatically compile translations.js
config.middleware.use I18n::JS::Middleware config.middleware.use I18n::JS::Middleware
# add the request-store to the middleware to make sure, that thread-loca variables are
# cleaned up after the request
require "request_store/middleware"
config.middleware.use RequestStore::Middleware
# Configure the default encoding used in templates for Ruby 1.9. # Configure the default encoding used in templates for Ruby 1.9.
config.encoding = "utf-8" config.encoding = "utf-8"

Loading…
Cancel
Save