Changes for THU

.gitignore

@@ -1,25 +1,23 @@
 !.gitignore
 .bundle
-.DS_Store
-.rvmrc
-
-Gemfile.lock
-
 db/*.sqlite3
 log/*.log
-public/assets
-public/index.html
-public/panel/**/*
-public/uploads/**/*
-solr/data
 tmp/**/*
+public/uploads/**/*
 uploads/**/*
-
+public/panel/**/*
+public/index.html
+.DS_Store
+solr/data/**/*
 *.swp
 *.pid
 *.lck
+public/assets
+config/application.rb
 
-.sass-cache/*
+.rvmrc
-*.supported
+
-mongoid.yml
+app/assets/javascripts/.DS_Store
-*.
+
+solr
+Gemfile.lock

Gemfile

@@ -1,5 +1,5 @@
 source 'http://rubygems.org'
-gem 'rails', "~> 3.2.9"
+gem 'rails', "~> 3.2"
 
 gem "brakeman"
 gem 'mime-types'
@@ -11,14 +11,9 @@ gem "net-ldap", "~> 0.3.1"
 gem 'devise', '1.5.3'
 gem 'exception_notification' # Send error trace
 gem 'execjs'
-gem 'jquery-rails', '3.0.4'
+gem 'jquery-rails'
-gem 'jquery-ui-rails', "4.0.5"
+gem 'jquery-ui-rails'
-gem "select2-rails", '3.3.1'
+gem 'kaminari', :git => 'git://github.com/amatsuda/kaminari.git'
-gem 'kaminari'
-gem 'time_difference'
-gem "acts_as_unvlogable"
-gem 'youtube_it'
-gem 'gotcha'
 
 # gem "memcached", "~> 1.4.3"
 # gem "memcache-client"
@@ -26,11 +21,10 @@ gem 'gotcha'
 gem 'mini_magick'
 gem 'mongoid', '> 2.1', '< 3.0.0'
 gem 'mongoid-tree', :require => 'mongoid/tree'
-gem "mongo_session_store-rails3", '3.0.6'
+gem "mongo_session_store-rails3", "~> 3.0"
 gem 'nokogiri'
 
-gem 'fb_graph'
+
-gem 'rack-gridfs'
 gem 'radius'
 gem 'rake'
 # gem 'remotipart'
@@ -39,7 +33,7 @@ gem 'resque-scheduler' # job scheduling
 gem 'resque-restriction'
 #gem 'rb-readline'
 # gem 'ruby-debug19'
-gem 'rubyzip', '< 1.0.0'
+gem 'rubyzip'
 
 gem 'sunspot_mongo'
 gem 'sunspot_solr'
@@ -50,15 +44,14 @@ gem 'sinatra'
 gem 'sprockets'
 gem 'social-share-button'
 
-gem 'ckeditor'
+gem 'tinymce-rails'
-# gem 'tinymce-rails', "~> 3.5.8"
 gem 'therubyracer' if RUBY_PLATFORM.downcase.include?("linux")
 gem 'libv8', '~> 3.11.8' if RUBY_PLATFORM.downcase.include?("linux")
 gem 'mongoid-encryptor', :require => 'mongoid/encryptor'
-gem 'rb-readline','~> 0.4.2' if RUBY_PLATFORM.downcase.include?("linux")
+gem 'rb-readline' if RUBY_PLATFORM.downcase.include?("linux")
 
 
-gem "impressionist",'1.2.0'
+gem "impressionist", :git => 'git://github.com/charlotte-ruby/impressionist.git'
 #gem 'contacts'
 #gem 'event-calendar', :require => 'event_calendar'#, :git => 'git://github.com/elevation/event_calendar.git'
 
@@ -68,8 +61,6 @@ gem 'chinese_pinyin', '0.4.1'
 gem 'rmmseg-cpp-huacnlee', '0.2.9'
 gem 'redis-namespace'
 gem 'redis-search'
-gem 'syslog-logger'
-gem "recaptcha", :require => "recaptcha/rails"
 
 # Gems used only for assets and not required
 # in production environments by default.
@@ -85,8 +76,8 @@ group :test, :development do
   gem 'pry-remote'
   gem 'pry-stack_explorer'
   gem 'pry-debugger'
-  gem 'debugger'
   gem 'faker'
+
   gem "sunspot-rails-tester"
   gem 'database_cleaner'  #Strategies for cleaning databases. Can be used to ensure a clean state for testing.
   gem "rspec", "~> 2.0"
@@ -98,9 +89,8 @@ group :test, :development do
   gem "watchr"
   gem "spork"
   gem "capybara"
-  #gem 'rack-mini-profiler'
-  gem "better_errors"
   # gem 'yard'
   # gem "bluecloth"
 end
 
+gem 'debugger'