diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2017-07-03 15:35:46 +0200 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2017-07-03 15:35:46 +0200 |
| commit | 951b2ee57d7463f14775d3c1b0fa220daf5844d4 (patch) | |
| tree | 13e5795c270ac09b98e559a61a7e271a46aba62f /Gemfile.lock | |
| parent | 59d3e03b81d09c70fc1249514c1848e701757513 (diff) | |
| parent | 29d65979f0db385d9872ba56221526638ad3db96 (diff) | |
| download | rails-951b2ee57d7463f14775d3c1b0fa220daf5844d4.tar.gz rails-951b2ee57d7463f14775d3c1b0fa220daf5844d4.tar.bz2 rails-951b2ee57d7463f14775d3c1b0fa220daf5844d4.zip | |
Merge branch 'master' of github.com:basecamp/activefile
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index d7dc3e105d..0438cb67fb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -24,11 +24,20 @@ GEM minitest (~> 5.1) tzinfo (~> 1.1) arel (8.0.0) + aws-sdk (2.10.7) + aws-sdk-resources (= 2.10.7) + aws-sdk-core (2.10.7) + aws-sigv4 (~> 1.0) + jmespath (~> 1.0) + aws-sdk-resources (2.10.7) + aws-sdk-core (= 2.10.7) + aws-sigv4 (1.0.0) byebug (9.0.6) concurrent-ruby (1.0.5) globalid (0.4.0) activesupport (>= 4.2.0) i18n (0.8.4) + jmespath (1.3.1) minitest (5.10.2) rake (12.0.0) sqlite3 (1.3.13) @@ -41,6 +50,7 @@ PLATFORMS DEPENDENCIES activefile! + aws-sdk bundler (~> 1.15) byebug rake |