From 9d2732fffa381356b021e645a781fecc9d38feb8 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Thu, 4 Jan 2018 14:29:09 +1300 Subject: [PATCH] removing comfortable mexican sofa for now --- Gemfile | 2 +- Gemfile.lock | 89 +++++++++++++--------------------------------------- 2 files changed, 23 insertions(+), 68 deletions(-) diff --git a/Gemfile b/Gemfile index 3c40d1d38..eb461c054 100644 --- a/Gemfile +++ b/Gemfile @@ -42,7 +42,7 @@ gem 'pg' gem 'ruby-units' # for unit conversion gem 'unicorn' # http server -gem 'comfortable_mexican_sofa' # content management system +# gem 'comfortable_mexican_sofa' # content management system gem 'bootstrap-kaminari-views' # bootstrap views for kaminari gem 'kaminari' # pagination diff --git a/Gemfile.lock b/Gemfile.lock index db72f11dc..bdd2bc94e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -25,9 +25,6 @@ GEM erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - active_link_to (1.0.5) - actionpack - addressable active_median (0.1.4) activerecord active_merchant-paypal-bogus-gateway (0.1.0) @@ -38,7 +35,7 @@ GEM activejob (5.1.4) activesupport (= 5.1.4) globalid (>= 0.3.6) - activemerchant (1.75.0) + activemerchant (1.76.0) activesupport (>= 3.2.14, < 6.x) builder (>= 2.1.2, < 4.0.0) i18n (>= 0.6.9) @@ -66,9 +63,7 @@ GEM erubi (>= 1.0.0) rack (>= 0.9.0) bluecloth (2.2.0) - bonsai-elasticsearch-rails (0.2.0) - elasticsearch-model (~> 0) - elasticsearch-rails (~> 0) + bonsai-elasticsearch-rails (0.0.4) bootstrap-datepicker-rails (1.7.1.1) railties (>= 3.0) bootstrap-kaminari-views (0.0.5) @@ -98,12 +93,9 @@ GEM launchy childprocess (0.8.0) ffi (~> 1.0, >= 1.0.11) - climate_control (0.2.0) cliver (0.3.2) - cocaine (0.5.8) - climate_control (>= 0.0.3, < 1.0) - codeclimate-test-reporter (1.0.7) - simplecov + codeclimate-test-reporter (1.0.8) + simplecov (<= 0.13) coderay (1.1.2) coffee-rails (4.2.2) coffee-script (>= 2.2.0) @@ -112,25 +104,14 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - comfortable_mexican_sofa (1.8.2) - active_link_to (>= 1.0.0) - coffee-rails (>= 3.1.0) - formatted_form (>= 2.1.0) - haml-rails (>= 0.3.0) - jquery-rails (>= 3.0.0) - jquery-ui-rails (>= 4.0.0) - paperclip (>= 3.4.0) - rails (>= 3.1.0) - redcarpet (>= 2.2.0) - sass-rails (>= 3.1.0) concurrent-ruby (1.0.5) connection_pool (2.2.1) - coveralls (0.7.1) - multi_json (~> 1.3) - rest-client - simplecov (>= 0.7) - term-ansicolor - thor + coveralls (0.8.19) + json (>= 1.8, < 3) + simplecov (~> 0.12.0) + term-ansicolor (~> 1.3) + thor (~> 0.19.1) + tins (~> 1.6) crass (1.0.3) csv_shaper (1.3.0) activesupport (>= 3.0.0) @@ -146,23 +127,21 @@ GEM warden (~> 1.2.3) diff-lcs (1.3) docile (1.1.5) - domain_name (0.5.20170404) - unf (>= 0.0.5, < 1.0.0) easy_translate (0.5.0) json thread thread_safe - elasticsearch (6.0.0) - elasticsearch-api (= 6.0.0) - elasticsearch-transport (= 6.0.0) - elasticsearch-api (6.0.0) + elasticsearch (5.0.4) + elasticsearch-api (= 5.0.4) + elasticsearch-transport (= 5.0.4) + elasticsearch-api (5.0.4) multi_json - elasticsearch-model (0.1.9) + elasticsearch-model (5.0.2) activesupport (> 3) - elasticsearch (> 0.4) + elasticsearch (~> 5) hashie - elasticsearch-rails (0.1.9) - elasticsearch-transport (6.0.0) + elasticsearch-rails (5.0.2) + elasticsearch-transport (5.0.4) faraday multi_json erubi (1.7.0) @@ -184,8 +163,6 @@ GEM flickraw (0.9.9) font-awesome-sass (4.7.0) sass (>= 3.2) - formatted_form (2.1.2) - rails (>= 3.1) friendly_id (5.2.3) activerecord (>= 4.0.0) geocoder (1.4.5) @@ -230,8 +207,6 @@ GEM haml (>= 4.0, < 6) nokogiri (>= 1.6.0) ruby_parser (~> 3.5) - http-cookie (1.0.3) - domain_name (~> 0.5) httparty (0.15.6) multi_xml (>= 0.5.2) i18n (0.9.1) @@ -297,10 +272,6 @@ GEM mini_mime (>= 0.1.1) memcachier (0.0.2) method_source (0.9.0) - mime-types (3.1) - mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mimemagic (0.3.2) mini_mime (1.0.0) mini_portile2 (2.3.0) minitest (5.11.1) @@ -308,7 +279,6 @@ GEM multi_json (1.11.3) multi_xml (0.6.0) multipart-post (2.0.0) - netrc (0.11.0) newrelic_rpm (4.7.1.340) nio4r (2.2.0) nokogiri (1.8.1) @@ -338,12 +308,6 @@ GEM omniauth-oauth (~> 1.1) rack orm_adapter (0.5.0) - paperclip (5.1.0) - activemodel (>= 4.2.0) - activesupport (>= 4.2.0) - cocaine (~> 0.5.5) - mime-types - mimemagic (~> 0.3.0) parallel (1.12.1) paranoia (2.4.0) activerecord (>= 4.0, < 5.2) @@ -402,20 +366,15 @@ GEM rb-fsevent (0.10.2) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) - redcarpet (3.4.0) redis (4.0.1) responders (2.4.0) actionpack (>= 4.2.0, < 5.3) railties (>= 4.2.0, < 5.3) - rest-client (2.0.2) - http-cookie (>= 1.0.2, < 2.0) - mime-types (>= 1.16, < 4.0) - netrc (~> 0.8) rspec-activemodel-mocks (1.0.3) activemodel (>= 3.0) activesupport (>= 3.0) rspec-mocks (>= 2.99, < 4.0) - rspec-core (3.7.0) + rspec-core (3.7.1) rspec-support (~> 3.7.0) rspec-expectations (3.7.0) diff-lcs (>= 1.2.0, < 2.0) @@ -465,7 +424,7 @@ GEM connection_pool (~> 2.2, >= 2.2.0) rack-protection (>= 1.5.0) redis (>= 3.3.4, < 5) - simplecov (0.15.1) + simplecov (0.12.0) docile (~> 1.1.0) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) @@ -485,7 +444,7 @@ GEM tins (~> 1.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) - thor (0.20.0) + thor (0.19.4) thread (0.2.2) thread_safe (0.3.6) tilt (2.0.8) @@ -496,9 +455,6 @@ GEM thread_safe (~> 0.1) uglifier (4.1.2) execjs (>= 0.3.0, < 3) - unf (0.1.4) - unf_ext - unf_ext (0.0.7.4) unicode-display_width (1.3.0) unicorn (5.4.0) kgio (~> 2.6) @@ -541,7 +497,6 @@ DEPENDENCIES capybara-screenshot codeclimate-test-reporter coffee-rails - comfortable_mexican_sofa coveralls csv_shaper d3-rails @@ -610,4 +565,4 @@ RUBY VERSION ruby 2.4.1p111 BUNDLED WITH - 1.16.0 + 1.16.1