Mercurial > zeropaste

changeset 342:4048614cb4cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update rails and other gems.
author edogawaconan <me@myconan.net>
date Tue, 01 Jul 2014 00:36:08 +0900
parents 5a404e66f8a4
children c914299c5459
files Gemfile Gemfile.lock
diffstat 2 files changed, 42 insertions(+), 44 deletions(-) [+]
line wrap: on
line diff
--- a/Gemfile	Wed May 28 15:19:20 2014 +0900
+++ b/Gemfile	Tue Jul 01 00:36:08 2014 +0900
@@ -11,9 +11,9 @@
 gem "jruby-openssl", :platforms => :jruby
 gem "dalli"
 
-gem "sass-rails"
+gem "sass-rails", "~> 4.0.3" # Rails 4.1 default
 
-gem "uglifier"
+gem "uglifier", ">= 1.3.0" # Rails 4.1 default
 gem "bootstrap-sass"
 
 gem "therubyrhino", :platforms => :jruby
--- a/Gemfile.lock	Wed May 28 15:19:20 2014 +0900
+++ b/Gemfile.lock	Tue Jul 01 00:36:08 2014 +0900
@@ -1,55 +1,53 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.1)
-      actionpack (= 4.1.1)
-      actionview (= 4.1.1)
+    actionmailer (4.1.2)
+      actionpack (= 4.1.2)
+      actionview (= 4.1.2)
       mail (~> 2.5.4)
-    actionpack (4.1.1)
-      actionview (= 4.1.1)
-      activesupport (= 4.1.1)
+    actionpack (4.1.2)
+      actionview (= 4.1.2)
+      activesupport (= 4.1.2)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.1)
-      activesupport (= 4.1.1)
+    actionview (4.1.2)
+      activesupport (= 4.1.2)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.1)
-      activesupport (= 4.1.1)
+    activemodel (4.1.2)
+      activesupport (= 4.1.2)
       builder (~> 3.1)
-    activerecord (4.1.1)
-      activemodel (= 4.1.1)
-      activesupport (= 4.1.1)
+    activerecord (4.1.2)
+      activemodel (= 4.1.2)
+      activesupport (= 4.1.2)
       arel (~> 5.0.0)
-    activerecord-jdbc-adapter (1.3.7)
+    activerecord-jdbc-adapter (1.3.8)
       activerecord (>= 2.2)
-    activerecord-jdbcpostgresql-adapter (1.3.7)
-      activerecord-jdbc-adapter (~> 1.3.7)
+    activerecord-jdbcpostgresql-adapter (1.3.8)
+      activerecord-jdbc-adapter (~> 1.3.8)
       jdbc-postgres (>= 9.1)
-    activesupport (4.1.1)
+    activesupport (4.1.2)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
     arel (5.0.1.20140414130214)
-    bootstrap-sass (3.1.1.1)
+    bootstrap-sass (3.2.0.0)
       sass (~> 3.2)
-    bouncy-castle-java (1.5.0147)
     builder (3.2.2)
     dalli (2.7.2)
     erubis (2.7.0)
-    execjs (2.1.0)
+    execjs (2.2.1)
     hike (1.2.3)
     hooves (0.7)
       unicorn (> 0)
     i18n (0.6.9)
     jdbc-postgres (9.3.1101)
-    jquery-rails (3.1.0)
+    jquery-rails (3.1.1)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    jruby-openssl (0.9.4)
-      bouncy-castle-java (>= 1.5.0147)
+    jruby-openssl (0.9.5-java)
     json (1.8.1)
     json (1.8.1-java)
     kgio (2.9.2)
@@ -57,33 +55,33 @@
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.25.1)
-    minitest (5.3.4)
+    minitest (5.3.5)
     multi_json (1.10.1)
-    newrelic_rpm (3.8.1.221)
+    newrelic_rpm (3.9.0.229)
     pg (0.17.1)
-    polyglot (0.3.4)
+    polyglot (0.3.5)
     puma (2.8.2)
       rack (>= 1.1, < 2.0)
     puma (2.8.2-java)
       rack (>= 1.1, < 2.0)
-    quiet_assets (1.0.2)
+    quiet_assets (1.0.3)
       railties (>= 3.1, < 5.0)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.1.1)
-      actionmailer (= 4.1.1)
-      actionpack (= 4.1.1)
-      actionview (= 4.1.1)
-      activemodel (= 4.1.1)
-      activerecord (= 4.1.1)
-      activesupport (= 4.1.1)
+    rails (4.1.2)
+      actionmailer (= 4.1.2)
+      actionpack (= 4.1.2)
+      actionview (= 4.1.2)
+      activemodel (= 4.1.2)
+      activerecord (= 4.1.2)
+      activesupport (= 4.1.2)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.1)
+      railties (= 4.1.2)
       sprockets-rails (~> 2.0)
-    railties (4.1.1)
-      actionpack (= 4.1.1)
-      activesupport (= 4.1.1)
+    railties (4.1.2)
+      actionpack (= 4.1.2)
+      activesupport (= 4.1.2)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     raindrops (0.13.0)
@@ -113,9 +111,9 @@
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (1.2.0)
+    tzinfo (1.2.1)
       thread_safe (~> 0.1)
-    uglifier (2.5.0)
+    uglifier (2.5.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     unicorn (4.8.3)
@@ -139,7 +137,7 @@
   puma
   quiet_assets
   rails (~> 4.1.0)
-  sass-rails
+  sass-rails (~> 4.0.3)
   therubyrhino
-  uglifier
+  uglifier (>= 1.3.0)
   unicorn