Skip to content

Commit

Permalink
Upgrading to ruby 2.2.4 + updating gems
Browse files Browse the repository at this point in the history
General Upgrades:
* update to ruby 2.2.4
* ugprade gems
* improve slow loading gems (boot time goes from ~4.9s to ~2.5s)
- new_relic become production only,
- phony_rails, rest-client, twilio-rudy aren't required in bundler
  • Loading branch information
Rio517 committed Dec 30, 2015
1 parent 7142598 commit 57f4b34
Show file tree
Hide file tree
Showing 8 changed files with 136 additions and 135 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-2.2.2
ruby-2.2.4
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Dockerfile for Mayday-2.0 Rails project

FROM ruby:2.2-onbuild
FROM ruby:2.2.4-onbuild

MAINTAINER [email protected]

Expand Down
16 changes: 9 additions & 7 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
source 'https://rubygems.org'
ruby '2.2.4'

gem 'rails', '4.2.0'
gem 'pg'
gem 'redis'
gem 'redis-objects'
gem 'redis-rails'
gem 'database_cleaner'
gem 'phony_rails'
gem 'phony_rails', :require => false

# Active Job
gem 'sidekiq'
gem 'sinatra' # Used for the sidekiq UI

# API consuming
gem 'rest-client'
gem 'rest-client', :require => false
gem 'oauth2'
gem 'twilio-ruby'
gem 'twilio-ruby', :require => false

# API publishing
gem 'rails-api'
Expand All @@ -24,10 +26,11 @@ gem 'rack-cors', :require => 'rack/cors'
gem 'oj'

# SysOps + Monitoring
gem 'rails_12factor', group: :production # Heroku-required
gem 'newrelic_rpm'
group :production do
gem 'rails_12factor' # Heroku-required
gem 'newrelic_rpm'
end
gem 'unicorn'
gem 'sinatra' # Used for the sidekiq UI
gem 'airbrake'

# Use ActiveModel has_secure_password
Expand Down Expand Up @@ -60,4 +63,3 @@ group :test do
gem 'timecop'
end

ruby '2.2.2'
Loading

0 comments on commit 57f4b34

Please sign in to comment.