Mercurial > zeropaste

diff Gemfile @ 362:cbf116933259

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update to rails 4.2.
author edogawaconan <me@myconan.net>
date Sat, 20 Dec 2014 17:57:34 +0900
parents 49ae9d1f4f2c
children dd5a107bff3d
line wrap: on
line diff
--- a/Gemfile	Mon Nov 24 17:14:24 2014 +0900
+++ b/Gemfile	Sat Dec 20 17:57:34 2014 +0900
@@ -1,8 +1,8 @@
 source "https://rubygems.org"
 
-gem "rails", "~> 4.1.0"
+gem "rails", "~> 4.2.0"
 gem "jquery-rails"
-gem "coffee-rails", "~> 4.0.0" # Rails 4.1 default
+gem "coffee-rails", "~> 4.1.0" # Rails 4.2 default
 
 # Bundle edge Rails instead:
 # gem "rails", :git => "git://github.com/rails/rails.git"
@@ -12,9 +12,9 @@
 gem "jruby-openssl", :platforms => :jruby
 gem "dalli"
 
-gem "sass-rails", "~> 4.0.3" # Rails 4.1 default
+gem "sass-rails", "~> 5.0" # Rails 4.2 default
 
-gem "uglifier", ">= 1.3.0" # Rails 4.1 default
+gem "uglifier", ">= 1.3.0" # Rails 4.2 default
 gem "bootstrap-sass"
 
 gem "therubyrhino", :platforms => :jruby