diff --git a/Gemfile b/Gemfile index 413ee03..0aa2afb 100644 --- a/Gemfile +++ b/Gemfile @@ -2,22 +2,22 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '4.1.8' +gem 'rails', '4.2.0' # Use postgresql as the database for Active Record gem 'pg' # Use SCSS for stylesheets -gem 'sass-rails', '~> 4.0.3' +gem 'sass-rails', '~> 4.0.5' # Use Uglifier as compressor for JavaScript assets gem 'uglifier', '>= 1.3.0' # Use CoffeeScript for .js.coffee assets and views -gem 'coffee-rails', '~> 4.0.0' +gem 'coffee-rails', '~> 4.0.1' # See https://github.com/sstephenson/execjs#readme for more supported runtimes gem 'therubyracer', platforms: :ruby # Use jquery as the JavaScript library -gem 'jquery-rails' +gem 'jquery-rails', '>= 3.1.4' # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks -gem 'turbolinks' +gem 'turbolinks', '>= 2.5.3' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder gem 'jbuilder', '~> 2.0' # bundle exec rake doc:rails generates the API under doc/api. @@ -38,17 +38,17 @@ gem 'spring', group: :development # Use debugger # gem 'debugger', group: [:development, :test] -gem 'twitter-bootstrap-rails' +gem 'twitter-bootstrap-rails', '>= 3.2.0' -gem 'devise' +gem 'devise', '>= 3.5.2' gem 'rails_12factor', group: :production gem 'geocoder' -gem 'rails_admin' +gem 'rails_admin', '>= 0.7.0' -gem 'kaminari' +gem 'kaminari', '>= 0.16.3' gem "paperclip", "~> 4.3" diff --git a/Gemfile.lock b/Gemfile.lock index 99b74f0..dac155d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,40 +1,49 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.1.8) - actionpack (= 4.1.8) - actionview (= 4.1.8) + actionmailer (4.2.0) + actionpack (= 4.2.0) + actionview (= 4.2.0) + activejob (= 4.2.0) mail (~> 2.5, >= 2.5.4) - actionpack (4.1.8) - actionview (= 4.1.8) - activesupport (= 4.1.8) - rack (~> 1.5.2) + rails-dom-testing (~> 1.0, >= 1.0.5) + actionpack (4.2.0) + actionview (= 4.2.0) + activesupport (= 4.2.0) + rack (~> 1.6.0) rack-test (~> 0.6.2) - actionview (4.1.8) - activesupport (= 4.1.8) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.1) + actionview (4.2.0) + activesupport (= 4.2.0) builder (~> 3.1) erubis (~> 2.7.0) - activemodel (4.1.8) - activesupport (= 4.1.8) + rails-dom-testing (~> 1.0, >= 1.0.5) + rails-html-sanitizer (~> 1.0, >= 1.0.1) + activejob (4.2.0) + activesupport (= 4.2.0) + globalid (>= 0.3.0) + activemodel (4.2.0) + activesupport (= 4.2.0) builder (~> 3.1) - activerecord (4.1.8) - activemodel (= 4.1.8) - activesupport (= 4.1.8) - arel (~> 5.0.0) - activesupport (4.1.8) - i18n (~> 0.6, >= 0.6.9) + activerecord (4.2.0) + activemodel (= 4.2.0) + activesupport (= 4.2.0) + arel (~> 6.0) + activesupport (4.2.0) + i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) - thread_safe (~> 0.1) + thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - arel (5.0.1.20140414130214) + arel (6.0.4) aws-sdk (1.66.0) aws-sdk-v1 (= 1.66.0) aws-sdk-v1 (1.66.0) json (~> 1.4) nokogiri (>= 1.4.4) - bcrypt (3.1.10) - builder (3.2.2) + bcrypt (3.1.12) + builder (3.2.3) climate_control (0.0.3) activesupport (>= 3.0) cocaine (0.5.7) @@ -45,46 +54,74 @@ GEM coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.9.1.1) - devise (3.5.2) + coffee-script-source (1.12.2) + commonjs (0.2.7) + concurrent-ruby (1.1.2) + crass (1.0.4) + devise (4.5.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 3.2.6, < 5) + railties (>= 4.1.0, < 6.0) responders - 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) + globalid (0.4.1) + activesupport (>= 4.2.0) + 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) - railties (>= 3.0, < 5.0) + jquery-rails (4.3.3) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.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) + less (2.6.0) + commonjs (~> 0.2.7) + less-rails (4.0.0) + actionpack (>= 4) + less (~> 2.6.0) + sprockets (>= 2) libv8 (3.16.14.13) - mail (2.6.3) - mime-types (>= 1.16, < 3) - mime-types (2.6.2) + loofah (2.2.3) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + 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) @@ -93,53 +130,61 @@ GEM mime-types mimemagic (= 0.3.0) pg (0.18.3) - rack (1.5.5) - rack-pjax (0.8.0) + rack (1.6.11) + 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) - actionmailer (= 4.1.8) - actionpack (= 4.1.8) - actionview (= 4.1.8) - activemodel (= 4.1.8) - activerecord (= 4.1.8) - activesupport (= 4.1.8) + rails (4.2.0) + actionmailer (= 4.2.0) + actionpack (= 4.2.0) + actionview (= 4.2.0) + activejob (= 4.2.0) + activemodel (= 4.2.0) + activerecord (= 4.2.0) + activesupport (= 4.2.0) bundler (>= 1.3.0, < 2.0) - railties (= 4.1.8) - sprockets-rails (~> 2.0) + railties (= 4.2.0) + sprockets-rails + rails-deprecated_sanitizer (1.0.3) + activesupport (>= 4.2.0.alpha) + rails-dom-testing (1.0.9) + activesupport (>= 4.2.0, < 5.0) + nokogiri (~> 1.6) + rails-deprecated_sanitizer (>= 1.0.1) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) 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) - railties (4.1.8) - actionpack (= 4.1.8) - activesupport (= 4.1.8) + railties (4.2.0) + actionpack (= 4.2.0) + activesupport (= 4.2.0) 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) - responders (1.1.2) - railties (>= 3.2, < 4.2) - safe_yaml (1.0.4) + remotipart (1.4.2) + responders (2.4.0) + actionpack (>= 4.2.0, < 5.3) + railties (>= 4.2.0, < 5.3) sass (3.2.19) sass-rails (4.0.5) railties (>= 4.0.0, < 5.0) @@ -150,7 +195,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,25 +204,27 @@ 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 - twitter-bootstrap-rails (3.2.0) - actionpack (~> 4.1) - execjs (~> 2.2) - rails (~> 4.1) - railties (~> 4.1) - tzinfo (1.2.2) + turbolinks (5.2.0) + turbolinks-source (~> 5.2) + turbolinks-source (5.2.0) + twitter-bootstrap-rails (3.2.2) + actionpack (>= 3.1) + execjs (>= 2.2.2, >= 2.2) + less-rails (>= 2.5.0) + railties (>= 3.1) + tzinfo (1.2.5) thread_safe (~> 0.1) uglifier (2.7.2) execjs (>= 0.3.0) json (>= 1.8.0) - warden (1.2.3) + warden (1.2.7) rack (>= 1.0) PLATFORMS @@ -185,24 +232,24 @@ PLATFORMS DEPENDENCIES aws-sdk (< 2.0) - coffee-rails (~> 4.0.0) - devise + coffee-rails (~> 4.0.1) + devise (>= 3.5.2) geocoder jbuilder (~> 2.0) - jquery-rails - kaminari + jquery-rails (>= 3.1.4) + kaminari (>= 0.16.3) paperclip (~> 4.3) pg - rails (= 4.1.8) + rails (= 4.2.0) rails_12factor - rails_admin - sass-rails (~> 4.0.3) + rails_admin (>= 0.7.0) + sass-rails (~> 4.0.5) sdoc (~> 0.4.0) spring therubyracer - turbolinks - twitter-bootstrap-rails + turbolinks (>= 2.5.3) + twitter-bootstrap-rails (>= 3.2.0) uglifier (>= 1.3.0) BUNDLED WITH - 1.10.6 + 1.16.6