Skip to content
This repository has been archived by the owner on Jul 29, 2019. It is now read-only.

[103] Upgrade to Rails 4 #58

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.9.3-p545
2.1.1
21 changes: 7 additions & 14 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ source 'https://rubygems.org'
#gem 'bundler', '~> 1.3.0.pre.5' # Bundler version to match what is used on Heroku.

## Essentials
ruby '1.9.3' # Ruby!
gem 'rails', '~> 3.2.17' # Rails!
ruby '2.1.1' # Ruby!
gem 'rails', '~> 4.0' # Rails!
gem 'pg' # PostgreSQL, the database server
gem 'thin' # Web server

Expand All @@ -18,14 +18,16 @@ gem 'rollbar', '~>0.10.11' # SaaS to track exceptions
gem 'meta-tags', :require => 'meta_tags' # Search Engine Optimization (SEO) plugin for Ruby on Rails applications.

## Performance and optimization
gem 'delayed_job_active_record' # Lets you queue tasks as background jobs
gem 'delayed_job_active_record', '~> 4.0.0' # Lets you queue tasks as background jobs
gem 'dalli' # memcache gem for Rails.cache
gem 'memcachier'
gem 'kgio' # gives 20~30% performance boost to Dalli

## Admin
gem 'activeadmin', '0.6.0' # Back-end Content Management System
gem 'devise', '~> 2.0' # User authentication

gem 'activeadmin', github: 'gregbell/active_admin'# Back-end Content Management System

gem 'devise', '~> 3.2' # User authentication
gem 'cancan' # User permissions

## Search and NLP
Expand All @@ -41,15 +43,6 @@ gem 'friendly_id' # Create permalinks / descriptive URLs
gem 'paperclip', '~> 3.0' # Easy file attachment library for ActiveRecord
gem 'aws-sdk', '~> 1.3.4' # Upload files to Amazon S3

## Gems used only for assets and not required
## in production environments by default.
group :assets do
gem 'sass-rails', '~> 3.2.5' # Rails support for Sass, a CSS extension language
gem "meta_search", '>= 1.1.0.pre' # Active_admin search for form_for
gem 'uglifier', '>= 1.0.3' # Squash down Javascript for speed
gem 'coffee-rails', '~> 3.2.1'
end

## Testing
group :test, :development do
gem 'rspec-rails', '>= 2.0' # Testing framework
Expand Down
Loading