diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2017-07-21 15:49:48 -0500 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2017-07-21 15:49:48 -0500 |
| commit | 438d5cc48e92345f000f51bc0780b543b3087846 (patch) | |
| tree | 2a9b5731fb3bddbc923a2c90d1576a8784ebfa57 | |
| parent | cbe89319de0d2eda8ee53ab7c9d3bc92751deeb4 (diff) | |
| download | rails-438d5cc48e92345f000f51bc0780b543b3087846.tar.gz rails-438d5cc48e92345f000f51bc0780b543b3087846.tar.bz2 rails-438d5cc48e92345f000f51bc0780b543b3087846.zip | |
Accept that this is a full-Rails engine
| -rw-r--r-- | Gemfile.lock | 50 | ||||
| -rw-r--r-- | activestorage.gemspec | 5 |
2 files changed, 46 insertions, 9 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 8fe836eb70..e18acab95b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,6 +2,16 @@ GIT remote: https://github.com/rails/rails.git revision: 5c16dd35a23f75038baf1527143ee44accf081ff specs: + actioncable (5.2.0.alpha) + actionpack (= 5.2.0.alpha) + nio4r (~> 2.0) + websocket-driver (~> 0.6.1) + actionmailer (5.2.0.alpha) + actionpack (= 5.2.0.alpha) + actionview (= 5.2.0.alpha) + activejob (= 5.2.0.alpha) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) actionpack (5.2.0.alpha) actionview (= 5.2.0.alpha) activesupport (= 5.2.0.alpha) @@ -29,15 +39,30 @@ GIT i18n (~> 0.7) minitest (~> 5.1) tzinfo (~> 1.1) + rails (5.2.0.alpha) + actioncable (= 5.2.0.alpha) + actionmailer (= 5.2.0.alpha) + actionpack (= 5.2.0.alpha) + actionview (= 5.2.0.alpha) + activejob (= 5.2.0.alpha) + activemodel (= 5.2.0.alpha) + activerecord (= 5.2.0.alpha) + activesupport (= 5.2.0.alpha) + bundler (>= 1.3.0) + railties (= 5.2.0.alpha) + sprockets-rails (>= 2.0.0) + railties (5.2.0.alpha) + actionpack (= 5.2.0.alpha) + activesupport (= 5.2.0.alpha) + method_source + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) PATH remote: . specs: activestorage (0.1) - actionpack (>= 5.2.0.alpha) - activejob (>= 5.2.0.alpha) - activerecord (>= 5.2.0.alpha) - activesupport (>= 5.2.0.alpha) + rails (>= 5.2.0.alpha) GEM remote: https://rubygems.org/ @@ -101,7 +126,10 @@ GEM multi_json (~> 1.10) loofah (2.0.3) nokogiri (>= 1.5.9) + mail (2.6.5) + mime-types (>= 1.16, < 4) memoist (0.16.0) + method_source (0.8.2) mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) @@ -111,6 +139,7 @@ GEM multi_json (1.12.1) multi_xml (0.6.0) multipart-post (2.0.0) + nio4r (2.1.0) nokogiri (1.8.0) mini_portile2 (~> 2.2.0) os (0.9.6) @@ -148,12 +177,23 @@ GEM faraday (~> 0.9) jwt (~> 1.5) multi_json (~> 1.10) + sprockets (3.7.1) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.0) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) sqlite3 (1.3.13) + thor (0.19.4) thread_safe (0.3.6) tzinfo (1.2.3) thread_safe (~> 0.1) uber (0.1.0) unicode-display_width (1.3.0) + websocket-driver (0.6.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) PLATFORMS ruby @@ -175,4 +215,4 @@ DEPENDENCIES sqlite3 BUNDLED WITH - 1.15.1 + 1.15.2 diff --git a/activestorage.gemspec b/activestorage.gemspec index 884d3287e6..9546b60783 100644 --- a/activestorage.gemspec +++ b/activestorage.gemspec @@ -9,10 +9,7 @@ Gem::Specification.new do |s| s.required_ruby_version = ">= 2.3.0" - s.add_dependency "activesupport", ">= 5.2.0.alpha" - s.add_dependency "activerecord", ">= 5.2.0.alpha" - s.add_dependency "actionpack", ">= 5.2.0.alpha" - s.add_dependency "activejob", ">= 5.2.0.alpha" + s.add_dependency "rails", ">= 5.2.0.alpha" s.add_development_dependency "bundler", "~> 1.15" |