diff --git a/Gemfile b/Gemfile index e64080e..9af33d8 100644 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,9 @@ +# coding: utf-8 source 'https://rubygems.org' ruby '2.3.0' -gem 'rails', '>= 5.0.0.beta2', '< 5.1' +gem 'rails', '< 5.1' gem 'sass-rails', '~> 5.0' gem 'jquery-rails' gem 'compass-rails', github: 'Compass/compass-rails', branch: 'master' @@ -31,9 +32,7 @@ gem 'react-rails' # https://github.com/amatsuda/kaminari/issues/774 gem 'kaminari', github: 'amatsuda/kaminari' gem 'redis', '~> 3.0' -# NOTE: 下記PRがマージされるまではエラーが出るので、個人のブランチを使用 -# https://github.com/heroku/rails_stdout_logging/pull/20 -gem 'rails_stdout_logging', github: 'kibitan/rails_stdout_logging', branch: 'compatible_rails5' +gem 'rails_stdout_logging' group :development do gem 'web-console', '~> 3.0' diff --git a/Gemfile.lock b/Gemfile.lock index b8807ee..c2dcc62 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,33 +1,26 @@ GIT remote: git://github.com/Compass/compass-rails.git - revision: 5b16c6c6ef8ad28f84e61a460602592fea5fc810 + revision: 86afb2c45ae329b3720be102c549612703e16402 branch: master specs: - compass-rails (3.0.0) + compass-rails (3.0.2) compass (~> 1.0.0) sass-rails (< 5.1) sprockets (< 4.0) GIT remote: git://github.com/amatsuda/kaminari.git - revision: 5629661f84ad808411f08bcea9c5513f3bb58265 + revision: 7d3dbd8e396ddc30454d1bf156a00f21ed9adaf6 specs: kaminari (1.0.0.alpha) actionpack (>= 3.0.0) activesupport (>= 3.0.0) -GIT - remote: git://github.com/kibitan/rails_stdout_logging.git - revision: 02a59481034e70e68f608b3bf1df96f75379d5a8 - branch: compatible_rails5 - specs: - rails_stdout_logging (0.0.4) - GIT remote: git://github.com/metaskills/less-rails.git - revision: 7e8e7a1123c206869cea86acfdb01b3835f001c1 + revision: 05186ebeea3a1dce50852b4d1285f31eb6585613 specs: - less-rails (2.7.1) + less-rails (2.8.0) actionpack (>= 4.0) less (~> 2.6.0) sprockets (> 2, < 4) @@ -36,53 +29,50 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (5.0.0.beta2) - actionpack (= 5.0.0.beta2) + actioncable (5.0.0) + actionpack (= 5.0.0) nio4r (~> 1.2) websocket-driver (~> 0.6.1) - actionmailer (5.0.0.beta2) - actionpack (= 5.0.0.beta2) - actionview (= 5.0.0.beta2) - activejob (= 5.0.0.beta2) + actionmailer (5.0.0) + actionpack (= 5.0.0) + actionview (= 5.0.0) + activejob (= 5.0.0) mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (5.0.0.beta2) - actionview (= 5.0.0.beta2) - activesupport (= 5.0.0.beta2) - rack (~> 2.x) + rails-dom-testing (~> 2.0) + actionpack (5.0.0) + actionview (= 5.0.0) + activesupport (= 5.0.0) + rack (~> 2.0) rack-test (~> 0.6.3) - rails-dom-testing (~> 1.0, >= 1.0.5) + rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.0.beta2) - activesupport (= 5.0.0.beta2) + actionview (5.0.0) + activesupport (= 5.0.0) builder (~> 3.1) erubis (~> 2.7.0) - rails-dom-testing (~> 1.0, >= 1.0.5) + rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (5.0.0.beta2) - activesupport (= 5.0.0.beta2) + activejob (5.0.0) + activesupport (= 5.0.0) globalid (>= 0.3.6) - activemodel (5.0.0.beta2) - activesupport (= 5.0.0.beta2) - activerecord (5.0.0.beta2) - activemodel (= 5.0.0.beta2) - activesupport (= 5.0.0.beta2) + activemodel (5.0.0) + activesupport (= 5.0.0) + activerecord (5.0.0) + activemodel (= 5.0.0) + activesupport (= 5.0.0) arel (~> 7.0) - activesupport (5.0.0.beta2) - concurrent-ruby (~> 1.0) + activesupport (5.0.0) + concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) - method_source minitest (~> 5.1) tzinfo (~> 1.1) - annotate (2.7.0) + annotate (2.7.1) activerecord (>= 3.2, < 6.0) - rake (~> 10.4) + rake (>= 10.4, < 12.0) arel (7.0.0) - ast (2.2.0) - autoprefixer-rails (6.3.1) + ast (2.3.0) + autoprefixer-rails (6.3.7) execjs - json babel-source (5.8.35) babel-transpiler (0.7.0) babel-source (>= 4.0, < 6) @@ -92,22 +82,16 @@ GEM bootstrap-sass (3.3.6) autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) - browserify-rails (2.2.1) - railties (>= 4.0.0, < 5.0) - sprockets (> 3.0.2) + browserify-rails (3.1.0) + railties (>= 4.0.0, < 5.1) + sprockets (>= 3.5.2) builder (3.2.2) - bullet (5.0.0) + bullet (5.1.1) activesupport (>= 3.0.0) - uniform_notifier (~> 1.9.0) - byebug (8.2.1) - chunky_png (1.3.5) - coderay (1.1.0) - coffee-rails (4.1.1) - coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.1.x) - coffee-script (2.4.1) - coffee-script-source - execjs + uniform_notifier (~> 1.10.0) + byebug (9.0.5) + chunky_png (1.3.6) + coderay (1.1.1) coffee-script-source (1.10.0) commonjs (0.2.7) compass (1.0.3) @@ -122,174 +106,182 @@ GEM sass (>= 3.3.0, < 3.5) compass-import-once (1.0.5) sass (>= 3.2, < 3.5) - concurrent-ruby (1.0.0) + concurrent-ruby (1.0.2) connection_pool (2.2.0) debug_inspector (0.0.2) diff-lcs (1.2.5) - dotenv (2.1.0) - dotenv-rails (2.1.0) - dotenv (= 2.1.0) + dotenv (2.1.1) + dotenv-rails (2.1.1) + dotenv (= 2.1.1) railties (>= 4.0, < 5.1) erubis (2.7.0) - execjs (2.6.0) - factory_girl (4.5.0) + eventmachine (1.2.0.1) + execjs (2.7.0) + factory_girl (4.7.0) activesupport (>= 3.0.0) - factory_girl_rails (4.5.0) - factory_girl (~> 4.5.0) + factory_girl_rails (4.7.0) + factory_girl (~> 4.7.0) railties (>= 3.0.0) - faker (1.6.3) - i18n (~> 0.5) - faraday (0.9.0) + faraday (0.9.2) multipart-post (>= 1.2, < 3) faraday_middleware (0.10.0) faraday (>= 0.7.4, < 0.10) - ffi (1.9.10) - font-awesome-sass (4.5.0) + faye-websocket (0.9.2) + eventmachine (>= 0.12.0) + websocket-driver (>= 0.5.1) + ffi (1.9.13) + font-awesome-sass (4.6.2) sass (>= 3.2) gemoji (2.1.0) globalid (0.3.6) activesupport (>= 4.1.0) - hashie (3.4.3) + hashie (3.4.4) hirb (0.7.3) hirb-unicode (0.0.5) hirb (~> 0.5) unicode-display_width (~> 0.1.1) - httpauth (0.2.1) i18n (0.7.0) - jbuilder (2.4.0) + jbuilder (2.5.0) activesupport (>= 3.0.0, < 5.1) multi_json (~> 1.2) - jquery-rails (4.1.0) - rails-dom-testing (~> 1.0) + jquery-rails (4.1.1) + rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (1.8.3) + jwt (1.5.4) less (2.6.0) commonjs (~> 0.2.7) libv8 (3.16.14.15) loofah (2.0.3) nokogiri (>= 1.5.9) - mail (2.6.3) - mime-types (>= 1.16, < 3) + mail (2.6.4) + mime-types (>= 1.16, < 4) method_source (0.8.2) - mime-types (2.99) - mini_portile2 (2.0.0) - minitest (5.8.4) - multi_json (1.11.2) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mini_portile2 (2.1.0) + minitest (5.9.0) + multi_json (1.12.1) + multi_xml (0.5.5) multipart-post (2.0.0) - mysql2 (0.3.20) + mysql2 (0.3.21) nio4r (1.2.1) - nokogiri (1.6.7.2) - mini_portile2 (~> 2.0.0.rc2) - oauth2 (0.6.1) - faraday (~> 0.7) - httpauth (~> 0.1) + nokogiri (1.6.8) + mini_portile2 (~> 2.1.0) + pkg-config (~> 1.1.7) + oauth2 (1.2.0) + faraday (>= 0.8, < 0.10) + jwt (~> 1.0) multi_json (~> 1.3) + multi_xml (~> 0.5) + rack (>= 1.2, < 3) omniauth (1.3.1) hashie (>= 1.2, < 4) rack (>= 1.0, < 3) - omniauth-google-oauth2 (0.2.2) - omniauth (~> 1.0) - omniauth-oauth2 - omniauth-oauth2 (1.0.2) - oauth2 (~> 0.6.0) - omniauth (~> 1.0) - parser (2.3.0.2) + omniauth-google-oauth2 (0.4.1) + jwt (~> 1.5.2) + multi_json (~> 1.3) + omniauth (>= 1.1.1) + omniauth-oauth2 (>= 1.3.1) + omniauth-oauth2 (1.4.0) + oauth2 (~> 1.0) + omniauth (~> 1.2) + parser (2.3.1.2) ast (~> 2.2) + pkg-config (1.1.7) powerpack (0.1.1) - pry (0.10.3) + pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) - pry-byebug (3.3.0) - byebug (~> 8.0) + pry-byebug (3.4.0) + byebug (~> 9.0) pry (~> 0.10) - pry-doc (0.8.0) + pry-doc (0.9.0) pry (~> 0.9) yard (~> 0.8) pry-rails (0.3.4) pry (>= 0.9.10) - puma (2.16.0) - rack (2.0.0.alpha) - json + puma (3.4.0) + rack (2.0.1) rack-test (0.6.3) rack (>= 1.0) - rails (5.0.0.beta2) - actioncable (= 5.0.0.beta2) - actionmailer (= 5.0.0.beta2) - actionpack (= 5.0.0.beta2) - actionview (= 5.0.0.beta2) - activejob (= 5.0.0.beta2) - activemodel (= 5.0.0.beta2) - activerecord (= 5.0.0.beta2) - activesupport (= 5.0.0.beta2) + rails (5.0.0) + actioncable (= 5.0.0) + actionmailer (= 5.0.0) + actionpack (= 5.0.0) + actionview (= 5.0.0) + activejob (= 5.0.0) + activemodel (= 5.0.0) + activerecord (= 5.0.0) + activesupport (= 5.0.0) bundler (>= 1.3.0, < 2.0) - railties (= 5.0.0.beta2) + railties (= 5.0.0) sprockets-rails (>= 2.0.0) - rails-deprecated_sanitizer (1.0.3) - activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.7) - activesupport (>= 4.2.0.beta, < 5.0) + rails-dom-testing (2.0.1) + activesupport (>= 4.2.0, < 6.0) nokogiri (~> 1.6.0) - rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.3) loofah (~> 2.0) rails_12factor (0.0.3) rails_serve_static_assets rails_stdout_logging rails_serve_static_assets (0.0.5) - railties (5.0.0.beta2) - actionpack (= 5.0.0.beta2) - activesupport (= 5.0.0.beta2) + rails_stdout_logging (0.0.5) + railties (5.0.0) + actionpack (= 5.0.0) + activesupport (= 5.0.0) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.1.0) - rake (10.5.0) + rake (11.2.2) rb-fsevent (0.9.7) - rb-inotify (0.9.5) + rb-inotify (0.9.7) ffi (>= 0.5.0) - react-rails (1.5.0) + react-rails (1.8.0) babel-transpiler (>= 0.7.0) coffee-script-source (~> 1.8) connection_pool execjs - rails (>= 3.2) + railties (>= 3.2) tilt redcarpet (3.3.4) - redis (3.2.2) + redis (3.3.0) ref (2.0.0) - rspec (3.1.0) - rspec-core (~> 3.1.0) - rspec-expectations (~> 3.1.0) - rspec-mocks (~> 3.1.0) + rspec (3.5.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) rspec-collection_matchers (1.1.2) rspec-expectations (>= 2.99.0.beta1) - rspec-core (3.1.7) - rspec-support (~> 3.1.0) - rspec-expectations (3.1.2) + rspec-core (3.5.1) + rspec-support (~> 3.5.0) + rspec-expectations (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.1.0) - rspec-mocks (3.1.3) - rspec-support (~> 3.1.0) - rspec-rails (3.1.0) + rspec-support (~> 3.5.0) + rspec-mocks (3.5.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.5.0) + rspec-rails (3.5.1) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.1.0) - rspec-expectations (~> 3.1.0) - rspec-mocks (~> 3.1.0) - rspec-support (~> 3.1.0) - rspec-support (3.1.2) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-support (~> 3.5.0) + rspec-support (3.5.0) rubocop (0.36.0) parser (>= 2.3.0.0, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.7) - ruby-progressbar (1.7.5) - sass (3.4.21) - sass-rails (5.0.4) - railties (>= 4.0.0, < 5.0) + ruby-progressbar (1.8.1) + sass (3.4.22) + sass-rails (5.0.5) + railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) @@ -297,16 +289,17 @@ GEM simple_form (3.2.1) actionpack (> 4, < 5.1) activemodel (> 4, < 5.1) - slack-api (0.0.4) - faraday (>= 0.7, <= 0.9) + slack-api (1.2.3) + faraday (>= 0.7, < 0.10) faraday_middleware (~> 0.8) + faye-websocket (~> 0.9.2) multi_json (~> 1.0, >= 1.0.3) slop (3.6.0) - spring (1.6.2) - sprockets (3.5.2) + spring (1.7.2) + sprockets (3.6.3) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.0.0) + sprockets-rails (3.1.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) @@ -315,24 +308,25 @@ GEM ref thor (0.19.1) thread_safe (0.3.5) - tilt (2.0.2) - turbolinks (2.5.3) - coffee-rails + tilt (2.0.5) + turbolinks (5.0.0) + turbolinks-source (~> 5) + turbolinks-source (5.0.0) tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (2.7.2) - execjs (>= 0.3.0) - json (>= 1.8.0) + uglifier (3.0.0) + execjs (>= 0.3.0, < 3) unicode-display_width (0.1.1) - uniform_notifier (1.9.0) - web-console (3.1.1) - activemodel (>= 4.2) + uniform_notifier (1.10.0) + web-console (3.3.1) + actionview (>= 5.0) + activemodel (>= 5.0) debug_inspector - railties (>= 4.2) - websocket-driver (0.6.3) + railties (>= 5.0) + websocket-driver (0.6.4) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) - yard (0.8.7.6) + yard (0.9.0) PLATFORMS ruby @@ -364,9 +358,9 @@ DEPENDENCIES pry-doc pry-rails puma - rails (>= 5.0.0.beta2, < 5.1) + rails (< 5.1) rails_12factor - rails_stdout_logging! + rails_stdout_logging react-rails redcarpet redis (~> 3.0) @@ -383,5 +377,8 @@ DEPENDENCIES uglifier (>= 1.3.0) web-console (~> 3.0) +RUBY VERSION + ruby 2.3.0p0 + BUNDLED WITH 1.12.5