diff --git a/Gemfile b/Gemfile index 413ee03..b8a9fa8 100644 --- a/Gemfile +++ b/Gemfile @@ -46,10 +46,10 @@ gem 'rails_12factor', group: :production gem 'geocoder' -gem 'rails_admin' +gem 'rails_admin', '>= 0.7.0' gem 'kaminari' gem "paperclip", "~> 4.3" -gem 'aws-sdk', '< 2.0' \ No newline at end of file +gem 'aws-sdk', '>= 1.66.0', '< 2.0' \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 99b74f0..f49c66c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -28,13 +28,13 @@ GEM thread_safe (~> 0.1) tzinfo (~> 1.1) arel (5.0.1.20140414130214) - aws-sdk (1.66.0) - aws-sdk-v1 (= 1.66.0) - aws-sdk-v1 (1.66.0) + aws-sdk (1.67.0) + aws-sdk-v1 (= 1.67.0) + aws-sdk-v1 (1.67.0) json (~> 1.4) - nokogiri (>= 1.4.4) + nokogiri (~> 1) bcrypt (3.1.10) - builder (3.2.2) + builder (3.2.3) climate_control (0.0.3) activesupport (>= 3.0) cocaine (0.5.7) @@ -45,7 +45,8 @@ GEM coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.9.1.1) + coffee-script-source (1.12.2) + concurrent-ruby (1.0.5) devise (3.5.2) bcrypt (~> 3.0) orm_adapter (~> 0.1) @@ -54,37 +55,51 @@ GEM thread_safe (~> 0.1) warden (~> 1.2.3) erubis (2.7.0) - execjs (2.6.0) - font-awesome-rails (4.4.0.0) - railties (>= 3.2, < 5.0) + execjs (2.7.0) + font-awesome-rails (4.7.0.4) + railties (>= 3.2, < 6.0) geocoder (1.2.11) - haml (4.0.7) + haml (5.0.4) + temple (>= 0.8.0) tilt hike (1.2.3) - i18n (0.7.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) jbuilder (2.3.2) activesupport (>= 3.0.0, < 5) multi_json (~> 1.2) - jquery-rails (3.1.4) + jquery-rails (3.1.5) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - jquery-ui-rails (5.0.5) + jquery-ui-rails (6.0.1) railties (>= 3.2.16) - json (1.8.3) - kaminari (0.16.3) - actionpack (>= 3.0.0) - activesupport (>= 3.0.0) + json (1.8.6) + kaminari (1.1.1) + activesupport (>= 4.1.0) + kaminari-actionview (= 1.1.1) + kaminari-activerecord (= 1.1.1) + kaminari-core (= 1.1.1) + kaminari-actionview (1.1.1) + actionview + kaminari-core (= 1.1.1) + kaminari-activerecord (1.1.1) + activerecord + kaminari-core (= 1.1.1) + kaminari-core (1.1.1) libv8 (3.16.14.13) - mail (2.6.3) - mime-types (>= 1.16, < 3) - mime-types (2.6.2) + mail (2.7.0) + mini_mime (>= 0.1.1) + mime-types (3.2.2) + mime-types-data (~> 3.2015) + mime-types-data (3.2018.0812) mimemagic (0.3.0) - mini_portile (0.6.2) - minitest (5.8.1) - multi_json (1.11.2) + mini_mime (1.0.1) + mini_portile2 (2.3.0) + minitest (5.11.3) + multi_json (1.13.1) nested_form (0.3.2) - nokogiri (1.6.6.2) - mini_portile (~> 0.6.0) + nokogiri (1.8.5) + mini_portile2 (~> 2.3.0) orm_adapter (0.5.0) paperclip (4.3.1) activemodel (>= 3.2.0) @@ -94,9 +109,9 @@ GEM mimemagic (= 0.3.0) pg (0.18.3) rack (1.5.5) - rack-pjax (0.8.0) + rack-pjax (1.0.0) nokogiri (~> 1.5) - rack (~> 1.1) + rack (>= 1.1) rack-test (0.6.3) rack (>= 1.0) rails (4.1.8) @@ -112,19 +127,18 @@ GEM rails_12factor (0.0.3) rails_serve_static_assets rails_stdout_logging - rails_admin (0.7.0) + rails_admin (1.4.2) builder (~> 3.1) coffee-rails (~> 4.0) font-awesome-rails (>= 3.0, < 5) - haml (~> 4.0) + haml (>= 4.0, < 6) jquery-rails (>= 3.0, < 5) - jquery-ui-rails (~> 5.0) - kaminari (~> 0.14) + jquery-ui-rails (>= 5.0, < 7) + kaminari (>= 0.14, < 2.0) nested_form (~> 0.3) - rack-pjax (~> 0.7) - rails (~> 4.0) - remotipart (~> 1.0) - safe_yaml (~> 1.0) + rack-pjax (>= 0.7) + rails (>= 4.0, < 6) + remotipart (~> 1.3) sass-rails (>= 4.0, < 6) rails_serve_static_assets (0.0.4) rails_stdout_logging (0.0.4) @@ -133,13 +147,12 @@ GEM activesupport (= 4.1.8) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.4.2) + rake (12.3.1) rdoc (4.2.0) ref (2.0.0) - remotipart (1.2.1) + remotipart (1.4.2) responders (1.1.2) railties (>= 3.2, < 4.2) - safe_yaml (1.0.4) sass (3.2.19) sass-rails (4.0.5) railties (>= 4.0.0, < 5.0) @@ -150,7 +163,7 @@ GEM json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) spring (1.4.0) - sprockets (2.12.4) + sprockets (2.12.5) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -159,11 +172,12 @@ GEM actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) + temple (0.8.0) therubyracer (0.12.2) libv8 (~> 3.16.14.0) ref - thor (0.19.1) - thread_safe (0.3.5) + thor (0.20.0) + thread_safe (0.3.6) tilt (1.4.1) turbolinks (2.5.3) coffee-rails @@ -172,7 +186,7 @@ GEM execjs (~> 2.2) rails (~> 4.1) railties (~> 4.1) - tzinfo (1.2.2) + tzinfo (1.2.5) thread_safe (~> 0.1) uglifier (2.7.2) execjs (>= 0.3.0) @@ -184,7 +198,7 @@ PLATFORMS ruby DEPENDENCIES - aws-sdk (< 2.0) + aws-sdk (>= 1.66.0, < 2.0) coffee-rails (~> 4.0.0) devise geocoder @@ -195,7 +209,7 @@ DEPENDENCIES pg rails (= 4.1.8) rails_12factor - rails_admin + rails_admin (>= 0.7.0) sass-rails (~> 4.0.3) sdoc (~> 0.4.0) spring @@ -205,4 +219,4 @@ DEPENDENCIES uglifier (>= 1.3.0) BUNDLED WITH - 1.10.6 + 1.16.6