Mercurial > rsstweet

changeset 35:6267a4188c05

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Welcome to rails 4.2.
author edogawaconan <me@myconan.net>
date Thu, 11 Dec 2014 15:38:23 +0900
parents e679ce4f73dd
children 1fdb3fc5ec31
files Gemfile Gemfile.lock config/environments/test.rb
diffstat 3 files changed, 42 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/Gemfile	Thu Dec 11 15:33:14 2014 +0900
+++ b/Gemfile	Thu Dec 11 15:38:23 2014 +0900
@@ -3,7 +3,7 @@
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 # gem "rails", "~> 4.1.4"
 
-rails_ver = "~> 4.1.4"
+rails_ver = "~> 4.2.0.rc2"
 gem "actionview", rails_ver
 gem "railties", rails_ver
 gem "actionpack", rails_ver
--- a/Gemfile.lock	Thu Dec 11 15:33:14 2014 +0900
+++ b/Gemfile.lock	Thu Dec 11 15:38:23 2014 +0900
@@ -1,17 +1,21 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (4.1.7)
-      actionview (= 4.1.7)
-      activesupport (= 4.1.7)
-      rack (~> 1.5.2)
+    actionpack (4.2.0.rc2)
+      actionview (= 4.2.0.rc2)
+      activesupport (= 4.2.0.rc2)
+      rack (~> 1.6.0.beta2)
       rack-test (~> 0.6.2)
-    actionview (4.1.7)
-      activesupport (= 4.1.7)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    actionview (4.2.0.rc2)
+      activesupport (= 4.2.0.rc2)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activesupport (4.1.7)
-      i18n (~> 0.6, >= 0.6.9)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    activesupport (4.2.0.rc2)
+      i18n (>= 0.7.0.beta1, < 0.8)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.1)
@@ -24,27 +28,43 @@
     erubis (2.7.0)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
-    http (0.6.2)
+    http (0.6.3)
       http_parser.rb (~> 0.6.0)
     http_parser.rb (0.6.0)
     http_parser.rb (0.6.0-java)
-    i18n (0.6.11)
+    i18n (0.7.0.beta1)
     json (1.8.1)
     json (1.8.1-java)
+    loofah (2.0.1)
+      nokogiri (>= 1.5.9)
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
-    minitest (5.4.2)
+    mini_portile (0.6.1)
+    minitest (5.4.3)
     multipart-post (2.0.0)
     naught (1.0.0)
-    rack (1.5.2)
+    nokogiri (1.6.5)
+      mini_portile (~> 0.6.0)
+    nokogiri (1.6.5-java)
+    nokogiri (1.6.5-x86-mingw32)
+      mini_portile (~> 0.6.0)
+    rack (1.6.0.beta2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    railties (4.1.7)
-      actionpack (= 4.1.7)
-      activesupport (= 4.1.7)
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.5)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.1)
+      loofah (~> 2.0)
+    railties (4.2.0.rc2)
+      actionpack (= 4.2.0.rc2)
+      activesupport (= 4.2.0.rc2)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
+    rake (10.4.2)
     simple_oauth (0.3.0)
     thor (0.19.1)
     thread_safe (0.3.4)
@@ -76,9 +96,9 @@
   x86-mingw32
 
 DEPENDENCIES
-  actionpack (~> 4.1.4)
-  actionview (~> 4.1.4)
+  actionpack (~> 4.2.0.rc2)
+  actionview (~> 4.2.0.rc2)
   dalli
-  railties (~> 4.1.4)
+  railties (~> 4.2.0.rc2)
   twitter
   twitter-text
--- a/config/environments/test.rb	Thu Dec 11 15:33:14 2014 +0900
+++ b/config/environments/test.rb	Thu Dec 11 15:38:23 2014 +0900
@@ -36,4 +36,6 @@
 
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
+
+  config.active_support.test_order = :random
 end