@@ -49,21 +49,25 @@ gem 'oj'
4949gem 'pg'
5050# we had pain with the 3.2.13 upgrade so monkey patch the security fix
5151# next time around we hope to upgrade
52- gem 'rails' , '3.2.12'
52+ # gem 'rails', '3.2.12'
53+ gem 'rails' , '4.0.0.rc1'
5354gem 'rake'
5455gem 'redis'
55- gem 'redis-rails'
56+ gem 'redis-rails' , :git => 'git://github.com/SamSaffron/redis-store.git'
5657gem 'rest-client'
5758gem 'rinku'
5859gem 'sanitize'
5960gem 'sass'
60- gem 'seed-fu'
61+ gem 'seed-fu' , :git => 'git://github.com/SamSaffron/seed-fu.git'
6162gem 'sidekiq'
6263gem 'sinatra' , require : nil
6364gem 'slim' # required for sidekiq-web
6465gem 'therubyracer' , require : 'v8'
6566gem 'thin'
6667gem 'diffy'
68+ gem 'rails-observers'
69+ gem 'protected_attributes'
70+ gem 'actionpack-action_caching'
6771
6872# Gem that enables support for plugins. It is required.
6973gem 'discourse_plugin' , path : 'vendor/gems/discourse_plugin'
@@ -80,7 +84,7 @@ gem 'discourse_emoji', path: 'vendor/gems/discourse_emoji'
8084# allow everywhere for now cause we are allowing asset debugging in prd
8185group :assets do
8286 gem 'sass'
83- gem 'sass-rails'
87+ gem 'sass-rails' , :git => 'git://github.com/rails/sass-rails.git'
8488 gem 'turbo-sprockets-rails3'
8589 gem 'uglifier'
8690end
@@ -98,7 +102,7 @@ group :test, :development do
98102 gem 'guard-jasmine'
99103 gem 'guard-rspec'
100104 gem 'guard-spork'
101- gem 'jasminerice'
105+ gem 'jasminerice' , :git => 'git://github.com/bradphelan/jasminerice.git'
102106 gem 'mocha' , require : false
103107 gem 'rb-fsevent'
104108 gem 'rb-inotify' , '~> 0.9' , require : RUBY_PLATFORM . include? ( 'linux' ) && 'rb-inotify'
117121
118122# we are using a custom sprockets repo to work around: https://github.com/rails/rails/issues/8099#issuecomment-16137638
119123# REVIEW EVERY RELEASE
120- gem "sprockets" , :git => "git://github.com/SamSaffron/sprockets.git" , :branch => "rails-compat"
124+ # gem "sprockets", :git => "git://github.com/SamSaffron/sprockets.git", :branch => "rails-compat"
121125
122126
123127# this is an optional gem, it provides a high performance replacement
0 commit comments