Merge pull request #555 from ruby-china/upgrade/rails-5

Upgrade Rails 5

.travis.yml

@@ -2,6 +2,9 @@ language: ruby
 env:
   - USE_OFFICIAL_GEM_SOURCE=1
 
+addons:
+  postgresql: "9.4"
+
 services:
   - postgresql
   - memcached

Gemfile

@@ -6,47 +6,44 @@ end
 
 ruby '2.3.0'
 
-gem 'rails', '4.2.5.1'
+gem 'rails', '5.0.0.beta2'
 gem 'sprockets'
 gem 'sass-rails'
 gem 'coffee-rails'
 gem 'uglifier'
 gem 'jquery-rails'
 gem 'jbuilder'
-gem 'turbolinks', git: 'https://github.com/rails/turbolinks.git'
+gem 'turbolinks', github: 'rails/turbolinks'
 gem 'jquery-turbolinks'
 gem 'dropzonejs-rails'
 
-gem 'actionpack-action_caching'
 gem 'rails-i18n'
 gem 'http_accept_language'
 gem 'rails_autolink'
 gem 'md_emoji'
 gem 'exception_notification'
 
-gem 'doorkeeper', '~> 2.2.1'
+gem 'doorkeeper', github: 'doorkeeper-gem/doorkeeper'
 gem 'doorkeeper-i18n'
 
-gem 'rails-perftest'
-gem 'ruby-prof'
+# gem 'rails-perftest'
+# gem 'ruby-prof'
 
 # 上传组件
-gem 'carrierwave', '~> 0.10.0'
+gem 'carrierwave'
 gem 'carrierwave-upyun'
 gem 'mini_magick'
 
 gem 'rucaptcha'
 gem 'letter_avatar'
 
 gem 'pg'
-gem 'activerecord_any_of'
 
 # remove this after migrate MongoDB into PostgreSQL
 gem 'mongo', require: false
 
 # 用户系统
-gem 'devise', '~> 3.5.1'
-gem 'devise-async'
+gem 'devise', '~> 4.0.0.rc1'
 gem 'devise-encryptable'
 
 # 分页
@@ -57,57 +54,55 @@ gem 'elasticsearch-model'
 gem 'elasticsearch-rails'
 
 # 三方平台 OAuth 验证登陆
-gem 'omniauth', '~> 1.2.2'
-gem 'omniauth-github', '~> 1.1.0'
+gem 'omniauth'
+gem 'omniauth-github'
 
 # permission
-gem 'cancancan', '~> 1.8.4'
+gem 'cancancan', '~> 1.13.1'
 
-gem 'redis', '~> 3.2.1'
-gem 'hiredis', '~> 0.6.0'
+gem 'redis'
+gem 'hiredis'
 # Redis 命名空间
-gem 'redis-namespace', '~> 1.5.1'
+gem 'redis-namespace'
 # 将一些数据存放入 Redis
-gem 'redis-objects', '1.1.0'
+gem 'redis-objects'
 
 gem 'rails-settings-cached'
 
 # Markdown 格式 & 文本处理
 gem 'redcarpet', '~> 3.3.4'
 gem 'rouge', '~> 1.8.0'
-gem 'auto-space', '0.0.4'
+gem 'auto-space'
 gem 'nokogiri'
 
 # YAML 配置信息
-gem 'settingslogic', '~> 2.0.9'
+gem 'settingslogic'
 
 # 队列
 gem 'sidekiq'
 # Sidekiq Web
-gem 'sinatra', require: nil
-
-gem 'message_bus'
+gem 'sinatra', github: 'sinatra/sinatra', require: nil
 
 # 分享功能
-gem 'social-share-button', '0.1.5'
+gem 'social-share-button'
 
 # 表单
-gem 'simple_form', '3.1.0'
+gem 'simple_form'
 
 # API
-gem 'grape', '0.7.0'
-gem 'active_model_serializers'
+gem 'grape'
+gem 'active_model_serializers', '0.9.2'
 gem 'grape-active_model_serializers'
 
 # Mailer
-gem 'postmark', '0.9.15'
-gem 'postmark-rails', '0.4.1'
+gem 'postmark'
+gem 'postmark-rails'
 
 # Dalli, kgio is for Dalli
 gem 'kgio'
-gem 'dalli', '2.7.4'
+gem 'dalli'
 
-gem 'unicorn', '5.0.0'
+gem 'puma'
 
 gem 'parallel'
 
@@ -116,37 +111,42 @@ gem 'rack-cors', require: 'rack/cors'
 gem 'rack-utf8_sanitizer'
 
 # Mini profiler
-gem 'rack-mini-profiler', require: false
+gem 'rack-mini-profiler', github: 'MiniProfiler/rack-mini-profiler', require: false
 
 gem 'oneapm_rpm'
 
 group :development do
-  gem 'derailed'
-end
-
-group :development, :test do
   gem 'capistrano', '2.9.0', require: false
-  gem 'capistrano-unicorn'
   gem 'rvm-capistrano', require: false
   gem 'capistrano-sidekiq'
 
+  gem 'derailed'
+
+  # Better Errors
+  gem 'better_errors'
+  gem 'binding_of_caller'
+end
+
+group :development, :test do
   gem 'rubocop'
-  gem 'rspec-rails', '~> 3.4'
+
+  gem 'rspec-rails', github: 'rspec/rspec-rails'
+  gem 'rspec-mocks', github: 'rspec/rspec-mocks'
+  gem 'rspec-core', github: 'rspec/rspec-core'
+  gem 'rspec-support', github: 'rspec/rspec-support'
+  gem 'rspec-expectations', github: 'rspec/rspec-expectations'
+  gem 'rspec', github: 'rspec/rspec'
+
+  gem 'rails-controller-testing'
+
   gem 'factory_girl_rails', '~> 4.5.0'
   gem 'database_cleaner'
-  gem 'capybara', '~> 2.3.0'
-  gem 'api_taster', '0.6.0'
+  gem 'capybara'
 
   gem 'jasmine-rails', '~> 0.10.2'
 
   gem 'colorize'
   gem 'letter_opener'
 
-  gem 'puma', '~> 2.14.0'
-
-  # Better Errors
-  gem 'better_errors'
-  gem 'binding_of_caller'
-
   gem 'bundler-audit', require: false
 end