Skip to content

Commit

Permalink
Upgrade to rails 4.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@pmq20
pmq20 committed Apr 9, 2014
1 parent aa845a8 commit 9a9fa01
Show file tree
Hide file tree
Showing 14 changed files with 139 additions and 94 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ config/config.yml
config/thin.yml
config/redis.yml
config/mailer_daemon.yml
config/secrets.yml
public/uploads/**/*
public/topics
public/topics/**/*
Expand Down
5 changes: 3 additions & 2 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,10 @@ gem "social-share-button", '0.1.5'
gem 'simple_form', "3.0.1"

# API
gem 'grape', github: 'intridea/grape', branch: 'frontier'
gem 'grape', github: 'intridea/grape', ref: 'd24bd2f758544244ac65f19c69b94f0ffc34e71b'

# Mailer
gem 'postmark', '0.9.15'
gem 'postmark-rails', '0.4.1'

# Google Analytics performance
Expand All @@ -101,7 +102,7 @@ group :development, :test do
gem 'capistrano', '2.9.0', require: false
gem 'rvm-capistrano', require: false
gem 'rspec-rails', '~> 2.13.2'
gem 'factory_girl_rails'
gem 'factory_girl_rails', '1.4.0'
gem 'database_cleaner'
gem "rspec-cells", '0.1.7'
gem 'fuubar'
Expand Down
165 changes: 88 additions & 77 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ GIT
GIT
remote: git://github.com/intridea/grape.git
revision: d24bd2f758544244ac65f19c69b94f0ffc34e71b
branch: frontier
ref: d24bd2f758544244ac65f19c69b94f0ffc34e71b
specs:
grape (0.1.5)
hashie (~> 1.2)
Expand All @@ -34,6 +34,7 @@ GIT
GEM
remote: http://ruby.taobao.org/
specs:
CFPropertyList (2.2.7)
actionmailer (4.0.4)
actionpack (= 4.0.4)
mail (~> 2.5.4)
Expand All @@ -60,7 +61,7 @@ GEM
multi_json (~> 1.3)
thread_safe (~> 0.1)
tzinfo (~> 0.3.37)
addressable (2.2.6)
addressable (2.3.6)
anjlab-bootstrap-rails (2.0.3.2)
railties (>= 3.0)
sass
Expand All @@ -73,12 +74,14 @@ GEM
sass-rails
arel (4.0.2)
auto-space (0.0.2)
bcrypt-ruby (3.1.1)
bootstrap-sass (2.3.1.3)
bcrypt (3.1.7)
bcrypt-ruby (3.1.5)
bcrypt (>= 3.1.3)
bootstrap-sass (2.3.2.2)
sass (~> 3.2)
bootstrap-will_paginate (0.0.3)
will_paginate
bson (1.7.1)
bson (1.10.0)
builder (3.1.4)
cancan (1.6.10)
capistrano (2.9.0)
Expand Down Expand Up @@ -106,53 +109,57 @@ GEM
cells (3.8.8)
actionpack (>= 3.0)
railties (>= 3.0)
celluloid (0.12.3)
celluloid (0.12.4)
facter (>= 1.6.12)
timers (>= 1.0.0)
childprocess (0.3.6)
ffi (~> 1.0, >= 1.0.6)
childprocess (0.5.2)
ffi (~> 1.0, >= 1.0.11)
chunky_png (1.2.8)
coffee-rails (4.0.0)
coffee-rails (4.0.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0.beta, < 5.0)
railties (>= 4.0.0, < 5.0)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.6.2)
connection_pool (0.9.2)
cookiejar (0.3.0)
coffee-script-source (1.7.0)
connection_pool (0.9.3)
cookiejar (0.3.2)
culerity (0.2.15)
daemons (1.1.9)
dalli (1.1.1)
database_cleaner (0.8.0)
database_cleaner (1.2.0)
devise (3.0.1)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
warden (~> 1.2.3)
devise-encryptable (0.1.2)
devise (>= 2.1.0)
diff-lcs (1.2.4)
em-http-request (0.3.0)
addressable (>= 2.0.0)
escape_utils
eventmachine (>= 0.12.9)
diff-lcs (1.2.5)
em-http-request (1.1.2)
addressable (>= 2.3.4)
cookiejar
em-socksify (>= 0.3)
eventmachine (>= 1.0.3)
http_parser.rb (>= 0.6.0)
em-socksify (0.3.0)
eventmachine (>= 1.0.0.beta.4)
erubis (2.7.0)
escape_utils (0.2.4)
eventmachine (1.0.3)
exception_notification (2.6.1)
exception_notification (4.0.1)
actionmailer (>= 3.0.4)
execjs (1.4.0)
multi_json (~> 1.0)
facter (1.6.14)
activesupport (>= 3.0.4)
execjs (2.0.2)
facter (2.0.1)
CFPropertyList (~> 2.2.6)
factory_girl (2.3.2)
activesupport
factory_girl_rails (1.4.0)
factory_girl (~> 2.3.0)
railties (>= 3.0.0)
faraday (0.8.7)
multipart-post (~> 1.1)
faye (0.8.3)
faraday (0.9.0)
multipart-post (>= 1.2, < 3)
faye (0.8.9)
cookiejar (>= 0.3.0)
em-http-request (>= 0.3.0)
eventmachine (>= 0.12.0)
Expand All @@ -161,44 +168,45 @@ GEM
yajl-ruby (>= 1.0.0)
faye-rails (1.0.0)
faye (~> 0.8.2)
faye-websocket (0.4.6)
faye-websocket (0.7.2)
eventmachine (>= 0.12.0)
ffi (1.0.11)
websocket-driver (>= 0.3.1)
ffi (1.9.3)
fuubar (1.2.1)
rspec (~> 2.0)
rspec-instafail (~> 0.2.0)
ruby-progressbar (~> 1.0)
garelic (0.0.2)
god (0.13.2)
god (0.13.4)
hashie (1.2.0)
highline (1.6.8)
highline (1.6.21)
hike (1.2.3)
httpauth (0.2.0)
hitimes (1.2.1)
http_parser.rb (0.6.0)
httpauth (0.2.1)
i18n (0.6.9)
jasmine-core (2.0.0)
jasmine-rails (0.6.0)
jasmine-core (>= 1.3, < 3.0)
phantomjs
rails (>= 3.1.0)
sprockets-rails
jbuilder (2.0.2)
activesupport (>= 3.0.0)
multi_json (>= 1.2.0)
jbuilder (2.0.6)
activesupport (>= 3.0.0, < 5)
multi_json (~> 1.2)
jquery-rails (3.0.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
jquery-turbolinks (2.0.0)
railties (>= 3.1.0)
turbolinks
json (1.8.0)
jwt (0.1.8)
json (1.8.1)
jwt (0.1.11)
multi_json (>= 1.5)
launchy (2.1.0)
addressable (~> 2.2.6)
letter_opener (0.0.2)
launchy
libwebsocket (0.1.6.1)
websocket
launchy (2.4.2)
addressable (~> 2.3)
letter_opener (1.2.0)
launchy (~> 2.2)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
Expand All @@ -209,8 +217,8 @@ GEM
mini_magick (3.3)
subexec (~> 0.1.0)
minitest (4.7.5)
mongo (1.7.1)
bson (~> 1.7.1)
mongo (1.10.0)
bson (~> 1.10.0)
mongoid_auto_increment_id (0.6.2)
mongoid (>= 3.1.0, < 4.1.0)
mongoid_colored_logger (0.2.2)
Expand All @@ -221,36 +229,36 @@ GEM
bundler (>= 1.0.0)
rails (>= 3.2.0)
railties (>= 3.2.0)
moped (1.5.0)
moped (1.5.2)
multi_json (1.9.2)
multi_xml (0.4.1)
multipart-post (1.2.0)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
net-sftp (2.0.5)
net-ssh (>= 2.0.9)
net-ssh (2.2.1)
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
multi_xml (0.5.5)
multipart-post (2.0.0)
net-scp (1.1.2)
net-ssh (>= 2.6.5)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
net-ssh (2.8.0)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
newrelic_rpm (3.6.8.168)
nokogiri (1.5.6)
nokogiri (1.5.11)
oauth2 (0.8.1)
faraday (~> 0.8)
httpauth (~> 0.1)
jwt (~> 0.1.4)
multi_json (~> 1.0)
rack (~> 1.2)
omniauth (1.0.1)
omniauth (1.0.3)
hashie (~> 1.2)
rack
omniauth-github (1.1.0)
omniauth-github (1.1.1)
omniauth (~> 1.0)
omniauth-oauth2 (~> 1.1)
omniauth-oauth2 (1.1.1)
oauth2 (~> 0.8.0)
omniauth (~> 1.0)
origin (1.1.0)
orm_adapter (0.4.0)
orm_adapter (0.5.0)
phantomjs (1.9.7.0)
polyglot (0.3.4)
postmark (0.9.15)
Expand Down Expand Up @@ -280,7 +288,7 @@ GEM
sprockets-rails (~> 2.0.0)
rails-i18n (0.1.8)
i18n (~> 0.5)
rails_autolink (1.1.0)
rails_autolink (1.1.5)
rails (> 3.1)
railties (4.0.4)
actionpack (= 4.0.4)
Expand All @@ -289,12 +297,12 @@ GEM
thor (>= 0.18.1, < 2.0)
rake (10.2.2)
redcarpet (3.0.0)
redis (3.0.2)
redis-namespace (1.2.1)
redis (3.0.7)
redis-namespace (1.2.2)
redis (~> 3.0.0)
redis-objects (0.5.2)
redis (>= 2.1.1)
remotipart (1.0.5)
remotipart (1.2.1)
rest-client (1.6.7)
mime-types (>= 1.16)
rouge (1.0.0)
Expand All @@ -310,29 +318,29 @@ GEM
rspec-expectations (2.13.0)
diff-lcs (>= 1.1.3, < 2.0)
rspec-instafail (0.2.4)
rspec-mocks (2.13.1)
rspec-mocks (2.13.0)
rspec-rails (2.13.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 2.13.0)
rspec-expectations (~> 2.13.0)
rspec-mocks (~> 2.13.0)
ruby-progressbar (1.2.0)
rubyzip (0.9.9)
rvm-capistrano (1.2.2)
ruby-progressbar (1.4.2)
rubyzip (1.1.3)
rvm-capistrano (1.4.1)
capistrano (>= 2.0.0)
sass (3.2.19)
sass-rails (4.0.3)
railties (>= 4.0.0, < 5.0)
sass (~> 3.2.0)
sprockets (~> 2.8, <= 2.11.0)
sprockets-rails (~> 2.0)
selenium-webdriver (2.26.0)
childprocess (>= 0.2.5)
libwebsocket (~> 0.1.3)
selenium-webdriver (2.41.0)
childprocess (>= 0.5.0)
multi_json (~> 1.0)
rubyzip
rubyzip (~> 1.0)
websocket (~> 1.0.4)
settingslogic (2.0.9)
sidekiq (2.5.3)
celluloid (~> 0.12.0)
Expand Down Expand Up @@ -362,23 +370,25 @@ GEM
thor (0.19.1)
thread_safe (0.3.3)
tilt (1.4.1)
timers (1.0.1)
timers (2.0.0)
hitimes
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
turbolinks (1.2.0)
coffee-rails
tzinfo (0.3.39)
uglifier (2.1.1)
uglifier (2.5.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
json (>= 1.8.0)
warden (1.2.3)
rack (>= 1.0)
websocket (1.0.4)
websocket (1.0.7)
websocket-driver (0.3.2)
will_paginate (3.0.4)
xpath (0.1.4)
nokogiri (~> 1.3)
yajl-ruby (1.1.0)
yajl-ruby (1.2.0)

PLATFORMS
ruby
Expand All @@ -404,7 +414,7 @@ DEPENDENCIES
devise-encryptable (= 0.1.2)
eventmachine (= 1.0.3)
exception_notification
factory_girl_rails
factory_girl_rails (= 1.4.0)
faye-rails (= 1.0.0)
fuubar
garelic (= 0.0.2)
Expand All @@ -425,6 +435,7 @@ DEPENDENCIES
nokogiri (~> 1.5.6)
omniauth (~> 1.0.1)
omniauth-github (~> 1.1.0)
postmark (= 0.9.15)
postmark-rails (= 0.4.1)
puma (= 2.6.0)
quiet_assets (~> 1.0.2)
Expand Down
2 changes: 1 addition & 1 deletion Rakefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
require File.expand_path('../config/application', __FILE__)
require 'rake'

RubyChina::Application.load_tasks
Rails.application.load_tasks

namespace :test do
desc "preparing config files..."
Expand Down
Loading

0 comments on commit 9a9fa01

Please sign in to comment.