From 68a4123f81f84f3f1c9be99da7261ef323eefab1 Mon Sep 17 00:00:00 2001 From: sue445 Date: Mon, 26 Dec 2016 01:33:12 +0900 Subject: [PATCH] bundle update activerecord padrino twitter --- Gemfile | 4 +- Gemfile.lock | 115 ++++++++++++++++++++++++++------------------------- 2 files changed, 60 insertions(+), 59 deletions(-) diff --git a/Gemfile b/Gemfile index 4652c1f6..0744cb84 100644 --- a/Gemfile +++ b/Gemfile @@ -18,14 +18,14 @@ gem "rake" # Component requirements gem "slim" gem "sass" -gem "activerecord", ">= 3.1", require: "active_record" +gem "activerecord", "~> 5.0.1", require: "active_record" # Test requirements gem "rspec", group: "test" gem "rack-test", require: "rack/test", group: "test" # Padrino Stable Gem -gem "padrino", "0.13.1" +gem "padrino", "0.13.3.3" # Or Padrino Edge # gem 'padrino', :github => 'padrino/padrino-framework' diff --git a/Gemfile.lock b/Gemfile.lock index 7d867dd5..e9d1f244 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,16 +2,16 @@ GEM remote: https://rubygems.org/ specs: Ascii85 (1.0.2) - activemodel (5.0.0.1) - activesupport (= 5.0.0.1) - activerecord (5.0.0.1) - activemodel (= 5.0.0.1) - activesupport (= 5.0.0.1) + activemodel (5.0.1) + activesupport (= 5.0.1) + activerecord (5.0.1) + activemodel (= 5.0.1) + activesupport (= 5.0.1) arel (~> 7.0) activerecord-simple_index_name (0.4.0) activerecord activesupport - activesupport (5.0.0.1) + activesupport (5.0.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) minitest (~> 5.1) @@ -26,7 +26,7 @@ GEM ast (2.3.0) buftok (0.2.0) coderay (1.1.1) - concurrent-ruby (1.0.2) + concurrent-ruby (1.0.3) coveralls (0.8.16) json (>= 1.8, < 3) simplecov (~> 0.12.0) @@ -36,19 +36,19 @@ GEM database_rewinder (0.7.1) diff-lcs (1.2.5) docile (1.1.5) - domain_name (0.5.20161021) + domain_name (0.5.20161129) unf (>= 0.0.5, < 1.0.0) dotenv (2.1.1) enumerable-lazy (0.0.2) - equalizer (0.0.10) + equalizer (0.0.11) factory_girl (4.7.0) activesupport (>= 3.0.0) - faraday (0.9.2) + faraday (0.10.0) multipart-post (>= 1.2, < 3) foreman (0.82.0) thor (~> 0.19.1) hashery (2.1.2) - http (1.0.4) + http (2.1.0) addressable (~> 2.3) http-cookie (~> 1.0) http-form_data (~> 1.0.1) @@ -58,7 +58,7 @@ GEM http-form_data (1.0.1) http_parser.rb (0.6.0) i18n (0.7.0) - json (1.8.3) + json (2.0.2) mail (2.6.4) mime-types (>= 1.16, < 4) mechanize (2.7.5) @@ -73,12 +73,10 @@ GEM memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) method_source (0.8.2) - mime-types (3.1) - mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) + mime-types (2.99.3) mini_portile2 (2.1.0) - minitest (5.9.1) - moneta (0.7.20) + minitest (5.10.1) + moneta (0.8.1) multi_json (1.12.1) multipart-post (2.0.0) mustermann19 (0.4.4) @@ -90,39 +88,40 @@ GEM nokogiri (1.6.8.1) mini_portile2 (~> 2.1.0) ntlm-http (0.1.1) - padrino (0.13.1) - padrino-admin (= 0.13.1) - padrino-cache (= 0.13.1) - padrino-core (= 0.13.1) - padrino-gen (= 0.13.1) - padrino-helpers (= 0.13.1) - padrino-mailer (= 0.13.1) - padrino-support (= 0.13.1) - padrino-admin (0.13.1) - padrino-core (= 0.13.1) - padrino-helpers (= 0.13.1) - padrino-cache (0.13.1) - moneta (~> 0.7.0) - padrino-core (= 0.13.1) - padrino-helpers (= 0.13.1) - padrino-core (0.13.1) + padrino (0.13.3.3) + padrino-admin (= 0.13.3.3) + padrino-cache (= 0.13.3.3) + padrino-core (= 0.13.3.3) + padrino-gen (= 0.13.3.3) + padrino-helpers (= 0.13.3.3) + padrino-mailer (= 0.13.3.3) + padrino-support (= 0.13.3.3) + padrino-admin (0.13.3.3) + padrino-core (= 0.13.3.3) + padrino-helpers (= 0.13.3.3) + padrino-cache (0.13.3.3) + moneta (~> 0.8.0) + padrino-core (= 0.13.3.3) + padrino-helpers (= 0.13.3.3) + padrino-core (0.13.3.3) activesupport (>= 3.1) mustermann19 - padrino-support (= 0.13.1) + padrino-support (= 0.13.3.3) rack-protection (>= 1.5.0) - sinatra (~> 1.4.6) + sinatra (>= 1.4.6) thor (~> 0.18) - padrino-gen (0.13.1) + padrino-gen (0.13.3.3) bundler (~> 1.0) - padrino-core (= 0.13.1) - padrino-helpers (0.13.1) + padrino-core (= 0.13.3.3) + padrino-helpers (0.13.3.3) i18n (~> 0.6, >= 0.6.7) - padrino-support (= 0.13.1) - tilt (~> 1.4.1) - padrino-mailer (0.13.1) + padrino-support (= 0.13.3.3) + tilt (>= 1.4.1, < 3) + padrino-mailer (0.13.3.3) mail (~> 2.5) - padrino-core (= 0.13.1) - padrino-support (0.13.1) + mime-types (< 3) + padrino-core (= 0.13.3.3) + padrino-support (0.13.3.3) activesupport (>= 3.1) parser (2.3.2.0) ast (~> 2.2) @@ -195,22 +194,21 @@ GEM temple (0.7.7) term-ansicolor (1.3.2) tins (~> 1.0) - thor (0.19.3) + thor (0.19.4) thread_safe (0.3.5) - tilt (1.4.1) + tilt (2.0.5) tins (1.13.0) ttfunk (1.4.0) - twitter (5.16.0) - addressable (~> 2.3) + twitter (6.0.0) + addressable (~> 2.5) buftok (~> 0.2.0) - equalizer (= 0.0.10) - faraday (~> 0.9.0) - http (~> 1.0) + equalizer (= 0.0.11) + faraday (~> 0.10.0) + http (~> 2.1) http_parser.rb (~> 0.6.0) - json (~> 1.8) - memoizable (~> 0.4.0) - naught (~> 1.0) - simple_oauth (~> 0.3.0) + memoizable (~> 0.4.2) + naught (~> 1.1) + simple_oauth (~> 0.3.1) tzinfo (1.2.2) thread_safe (~> 0.1) unf (0.1.4) @@ -222,7 +220,7 @@ PLATFORMS ruby DEPENDENCIES - activerecord (>= 3.1) + activerecord (~> 5.0.1) activerecord-simple_index_name annotate coveralls @@ -232,7 +230,7 @@ DEPENDENCIES foreman mechanize newrelic_rpm - padrino (= 0.13.1) + padrino (= 0.13.3.3) pdf-reader pg pry @@ -250,5 +248,8 @@ DEPENDENCIES sqlite3 twitter +RUBY VERSION + ruby 2.3.3p222 + BUNDLED WITH - 1.12.5 + 1.13.6