From c48028d137b062f85afaa51d3f4dadd319a89dcd Mon Sep 17 00:00:00 2001 From: Peter Halloran Date: Wed, 31 May 2017 16:55:43 -0500 Subject: [PATCH 1/2] feat(schema.rb): add citext to url in webpages --- Gemfile.lock | 196 +++++++++--------- ...15319_make_webpage_url_case_insensitive.rb | 6 + db/schema.rb | 7 +- 3 files changed, 108 insertions(+), 101 deletions(-) create mode 100644 db/migrate/20170531215319_make_webpage_url_case_insensitive.rb diff --git a/Gemfile.lock b/Gemfile.lock index ab7f737e5..bba226e48 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -24,39 +24,39 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (5.0.2) - actionpack (= 5.0.2) + actioncable (5.0.3) + actionpack (= 5.0.3) nio4r (>= 1.2, < 3.0) websocket-driver (~> 0.6.1) - actionmailer (5.0.2) - actionpack (= 5.0.2) - actionview (= 5.0.2) - activejob (= 5.0.2) + actionmailer (5.0.3) + actionpack (= 5.0.3) + actionview (= 5.0.3) + activejob (= 5.0.3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.0.2) - actionview (= 5.0.2) - activesupport (= 5.0.2) + actionpack (5.0.3) + actionview (= 5.0.3) + activesupport (= 5.0.3) rack (~> 2.0) rack-test (~> 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.2) - activesupport (= 5.0.2) + actionview (5.0.3) + activesupport (= 5.0.3) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.0.2) - activesupport (= 5.0.2) + activejob (5.0.3) + activesupport (= 5.0.3) globalid (>= 0.3.6) - activemodel (5.0.2) - activesupport (= 5.0.2) - activerecord (5.0.2) - activemodel (= 5.0.2) - activesupport (= 5.0.2) + activemodel (5.0.3) + activesupport (= 5.0.3) + activerecord (5.0.3) + activemodel (= 5.0.3) + activesupport (= 5.0.3) arel (~> 7.0) - activesupport (5.0.2) + activesupport (5.0.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) minitest (~> 5.1) @@ -72,15 +72,15 @@ GEM ansi (1.5.0) arel (7.1.4) attr_required (1.0.1) - autoprefixer-rails (6.7.7.2) + autoprefixer-rails (7.1.1) execjs - aws-sdk (2.9.14) - aws-sdk-resources (= 2.9.14) - aws-sdk-core (2.9.14) + aws-sdk (2.9.27) + aws-sdk-resources (= 2.9.27) + aws-sdk-core (2.9.27) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.9.14) - aws-sdk-core (= 2.9.14) + aws-sdk-resources (2.9.27) + aws-sdk-core (= 2.9.27) aws-sigv4 (1.0.0) axiom-types (0.1.1) descendants_tracker (~> 0.0.4) @@ -103,14 +103,14 @@ GEM breadcrumbs_on_rails (3.0.1) builder (3.2.3) byebug (9.0.6) - capybara (2.13.0) + capybara (2.14.0) addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - cells (4.1.6) + cells (4.1.7) declarative-builder (< 0.2.0) declarative-option (< 0.2.0) tilt (>= 1.4, < 3) @@ -118,13 +118,13 @@ GEM cells-haml (0.0.10) cells (>= 4.0.1, <= 6.0.0) haml (>= 4.1.0.beta.1) - cells-rails (0.0.7) + cells-rails (0.0.8) actionpack (>= 3.0) cells (>= 4.1.6, < 5.0.0) - childprocess (0.6.3) + childprocess (0.7.0) ffi (~> 1.0, >= 1.0.11) choice (0.2.0) - climate_control (0.1.0) + climate_control (0.2.0) cliver (0.3.2) cocaine (0.5.8) climate_control (>= 0.0.3, < 1.0) @@ -148,8 +148,8 @@ GEM rails (>= 4) react_on_rails (~> 6) shrine (~> 2.6) - database_cleaner (1.5.3) - debug_inspector (0.0.2) + database_cleaner (1.6.1) + debug_inspector (0.0.3) declarative-builder (0.1.0) declarative-option (< 0.2.0) declarative-option (0.1.0) @@ -166,13 +166,13 @@ GEM dialog-polyfill-rails (0.4.5.1) diff-lcs (1.3) docile (1.1.5) - doorkeeper (4.2.5) + doorkeeper (4.2.6) railties (>= 4.2) dotenv (2.2.1) dotenv-rails (2.2.1) dotenv (= 2.2.1) railties (>= 3.2, < 5.2) - down (2.5.1) + down (3.0.0) elasticsearch (5.0.4) elasticsearch-api (= 5.0.4) elasticsearch-transport (= 5.0.4) @@ -190,10 +190,10 @@ GEM elasticsearch-transport (5.0.4) faraday multi_json - email_spec (2.1.0) + email_spec (2.1.1) htmlentities (~> 4.3.3) launchy (~> 2.1) - mail (~> 2.6.3) + mail (~> 2.6) equalizer (0.0.11) erubis (2.7.0) excon (0.55.0) @@ -219,7 +219,7 @@ GEM flipper (~> 0.10.2) rack (>= 1.4, < 3) rack-protection (>= 1.5.3, < 2.1.0) - fog-core (1.44.1) + fog-core (1.44.3) builder excon (~> 0.49) formatador (~> 0.2) @@ -251,7 +251,7 @@ GEM grape-entity (0.6.1) activesupport (>= 5.0.0) multi_json (>= 1.3.2) - grape-swagger (0.27.1) + grape-swagger (0.27.2) grape (>= 0.16.2) guard (2.14.1) formatador (>= 0.2.4) @@ -275,7 +275,7 @@ GEM guard (~> 2.1) guard-compat (~> 1.1) rspec (>= 2.99.0, < 4.0) - haml (5.0.0) + haml (5.0.1) temple (>= 0.8.0) tilt hashie (3.5.5) @@ -284,9 +284,9 @@ GEM hashr (2.0.1) htmlentities (4.3.4) httpclient (2.8.3) - i18n (0.8.1) + i18n (0.8.4) ice_nine (0.11.2) - image_optim (0.24.2) + image_optim (0.24.3) exifr (~> 1.2, >= 1.2.2) fspath (~> 3.0) image_size (~> 1.5) @@ -299,15 +299,15 @@ GEM image_size (1.5.0) in_threads (1.4.0) interactor (3.1.0) - interactor-rails (2.0.2) + interactor-rails (2.1.1) interactor (~> 3.0) - rails (>= 3, < 5.1) + rails (>= 4.2, < 5.2) jasmine (2.6.0) jasmine-core (>= 2.6.0, < 3.0.0) phantomjs rack (>= 1.2.1) rake - jasmine-core (2.6.1) + jasmine-core (2.6.2) jasmine-rails (0.14.1) jasmine-core (>= 1.3, < 3.0) phantomjs (>= 1.9) @@ -324,7 +324,7 @@ GEM jquery-ui-rails (6.0.1) railties (>= 3.2.16) json (2.1.0) - json_spec (1.1.4) + json_spec (1.1.5) multi_json (~> 1.0) rspec (>= 2.0, < 4.0) jsonb_accessor (1.0.0.beta.6) @@ -343,12 +343,12 @@ GEM ruby_dep (~> 1.2) loofah (2.0.3) nokogiri (>= 1.5.9) - lumberjack (1.0.11) + lumberjack (1.0.12) mail (2.6.5) mime-types (>= 1.16, < 4) - material_design_lite-sass (1.3.0) - autoprefixer-rails (~> 6.0) - sass (~> 3.3) + material_design_lite-sass (1.3.0.1) + autoprefixer-rails (>= 6.5) + sass (>= 3.3) metaclass (0.0.4) method_source (0.8.2) mime-types (3.1) @@ -359,7 +359,7 @@ GEM mini_portile2 (2.1.0) mini_racer (0.1.9) libv8 (~> 5.3) - minitest (5.10.1) + minitest (5.10.2) mocha (1.2.1) metaclass (~> 0.0.1) multi_json (1.12.1) @@ -369,13 +369,13 @@ GEM mustermann-grape (1.0.0) mustermann (~> 1.0.0) nenv (0.3.0) - newrelic_rpm (4.1.0.333) + newrelic_rpm (4.2.0.334) ng-rails-csrf (0.1.0) ngannotate-rails (1.2.2) execjs rails (>= 3.1) - nio4r (2.0.0) - nokogiri (1.7.1) + nio4r (2.1.0) + nokogiri (1.7.2) mini_portile2 (~> 2.1.0) non-stupid-digest-assets (1.0.9) sprockets (>= 2.0) @@ -396,7 +396,7 @@ GEM activerecord (>= 4.0, < 5.2) pg (0.20.0) phantomjs (2.1.1.0) - poltergeist (1.14.0) + poltergeist (1.15.0) capybara (~> 2.1) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) @@ -420,7 +420,7 @@ GEM puma (3.8.2) pundit (1.1.0) activesupport (>= 3.0.0) - rack (2.0.1) + rack (2.0.3) rack-accept (0.4.5) rack (>= 0.4) rack-cors (0.4.1) @@ -430,35 +430,35 @@ GEM httpclient (>= 2.4) multi_json (>= 1.3.6) rack (>= 1.1) - rack-protection (2.0.0.rc2) + rack-protection (2.0.0) rack rack-test (0.6.3) rack (>= 1.0) - rails (5.0.2) - actioncable (= 5.0.2) - actionmailer (= 5.0.2) - actionpack (= 5.0.2) - actionview (= 5.0.2) - activejob (= 5.0.2) - activemodel (= 5.0.2) - activerecord (= 5.0.2) - activesupport (= 5.0.2) + rails (5.0.3) + actioncable (= 5.0.3) + actionmailer (= 5.0.3) + actionpack (= 5.0.3) + actionview (= 5.0.3) + activejob (= 5.0.3) + activemodel (= 5.0.3) + activerecord (= 5.0.3) + activesupport (= 5.0.3) bundler (>= 1.3.0, < 2.0) - railties (= 5.0.2) + railties (= 5.0.3) sprockets-rails (>= 2.0.0) - rails-dom-testing (2.0.2) - activesupport (>= 4.2.0, < 6.0) - nokogiri (~> 1.6) - rails-erd (1.5.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-erd (1.5.2) activerecord (>= 3.2) activesupport (>= 3.2) choice (~> 0.2.0) ruby-graphviz (~> 1.2) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - railties (5.0.2) - actionpack (= 5.0.2) - activesupport (= 5.0.2) + railties (5.0.3) + actionpack (= 5.0.3) + activesupport (= 5.0.3) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) @@ -498,42 +498,42 @@ GEM actionpack (>= 4.2.0, < 5.3) railties (>= 4.2.0, < 5.3) rolify (5.1.0) - rspec (3.5.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-core (3.5.4) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) + rspec (3.6.0) + rspec-core (~> 3.6.0) + rspec-expectations (~> 3.6.0) + rspec-mocks (~> 3.6.0) + rspec-core (3.6.0) + rspec-support (~> 3.6.0) + rspec-expectations (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-mocks (3.5.0) + rspec-support (~> 3.6.0) + rspec-mocks (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-rails (3.5.2) + rspec-support (~> 3.6.0) + rspec-rails (3.6.0) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-support (~> 3.5.0) + rspec-core (~> 3.6.0) + rspec-expectations (~> 3.6.0) + rspec-mocks (~> 3.6.0) + rspec-support (~> 3.6.0) rspec-sidekiq (3.0.1) rspec-core (~> 3.0, >= 3.0.0) sidekiq (>= 2.4.0) - rspec-support (3.5.0) + rspec-support (3.6.0) ruby-graphviz (1.2.3) ruby-prof (0.16.2) ruby_dep (1.5.0) rubyzip (1.2.1) - sass (3.4.23) + sass (3.4.24) sass-rails (5.0.6) railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - sentry-raven (2.4.0) + sentry-raven (2.5.1) faraday (>= 0.7.6, < 1.0) shellany (0.0.1) shoulda-matchers (3.1.1) @@ -549,11 +549,11 @@ GEM docile (~> 1.1.0) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) - sinatra (2.0.0.rc2) - mustermann (= 1.0.0) + simplecov-html (0.10.1) + sinatra (2.0.0) + mustermann (~> 1.0) rack (~> 2.0) - rack-protection (= 2.0.0.rc2) + rack-protection (= 2.0.0) tilt (~> 2.0) six (0.2.0) slop (3.6.0) @@ -572,7 +572,7 @@ GEM transitions (1.2.1) turbolinks (5.0.1) turbolinks-source (~> 5) - turbolinks-source (5.0.0) + turbolinks-source (5.0.3) tzinfo (1.2.3) thread_safe (~> 0.1) uber (0.1.0) @@ -588,7 +588,7 @@ GEM websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) - xpath (2.0.0) + xpath (2.1.0) nokogiri (~> 1.3) yt (0.30.1) activesupport @@ -714,4 +714,4 @@ RUBY VERSION ruby 2.4.0p0 BUNDLED WITH - 1.14.6 + 1.14.3 diff --git a/db/migrate/20170531215319_make_webpage_url_case_insensitive.rb b/db/migrate/20170531215319_make_webpage_url_case_insensitive.rb new file mode 100644 index 000000000..52cea0b14 --- /dev/null +++ b/db/migrate/20170531215319_make_webpage_url_case_insensitive.rb @@ -0,0 +1,6 @@ +class MakeWebpageUrlCaseInsensitive < ActiveRecord::Migration[5.0] + def change + enable_extension :citext + change_column :webpages, :url, :citext + end +end diff --git a/db/schema.rb b/db/schema.rb index de428ea9b..a7efa7be7 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,12 +10,13 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20170525015850) do +ActiveRecord::Schema.define(version: 20170531215319) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" enable_extension "hstore" enable_extension "uuid-ossp" + enable_extension "citext" create_table "applications", force: :cascade do |t| t.string "name" @@ -452,7 +453,7 @@ create_table "webpages", force: :cascade do |t| t.integer "user_id", null: false t.string "name" - t.string "url" + t.citext "url" t.string "thumbnail_file_name" t.string "thumbnail_content_type" t.integer "thumbnail_file_size" @@ -471,8 +472,8 @@ t.string "dynamic_yield_sku" t.string "dynamic_yield_category" t.jsonb "tables_widget" - t.jsonb "accordion_group_widget" t.jsonb "charts_widget" + t.jsonb "accordion_group_widget" t.index ["user_id"], name: "index_webpages_on_user_id", using: :btree end From 85b8e1736eae3b07c2e0cb3dc677a9554d45725a Mon Sep 17 00:00:00 2001 From: Peter Halloran Date: Thu, 1 Jun 2017 09:11:24 -0500 Subject: [PATCH 2/2] fix(Gemfile.lock): set Gemfile.lock to match develop --- Gemfile.lock | 196 +++++++++++++++++++++++++-------------------------- 1 file changed, 98 insertions(+), 98 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index bba226e48..ab7f737e5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -24,39 +24,39 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (5.0.3) - actionpack (= 5.0.3) + actioncable (5.0.2) + actionpack (= 5.0.2) nio4r (>= 1.2, < 3.0) websocket-driver (~> 0.6.1) - actionmailer (5.0.3) - actionpack (= 5.0.3) - actionview (= 5.0.3) - activejob (= 5.0.3) + actionmailer (5.0.2) + actionpack (= 5.0.2) + actionview (= 5.0.2) + activejob (= 5.0.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.0.3) - actionview (= 5.0.3) - activesupport (= 5.0.3) + actionpack (5.0.2) + actionview (= 5.0.2) + activesupport (= 5.0.2) rack (~> 2.0) rack-test (~> 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.3) - activesupport (= 5.0.3) + actionview (5.0.2) + activesupport (= 5.0.2) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.0.3) - activesupport (= 5.0.3) + activejob (5.0.2) + activesupport (= 5.0.2) globalid (>= 0.3.6) - activemodel (5.0.3) - activesupport (= 5.0.3) - activerecord (5.0.3) - activemodel (= 5.0.3) - activesupport (= 5.0.3) + activemodel (5.0.2) + activesupport (= 5.0.2) + activerecord (5.0.2) + activemodel (= 5.0.2) + activesupport (= 5.0.2) arel (~> 7.0) - activesupport (5.0.3) + activesupport (5.0.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) minitest (~> 5.1) @@ -72,15 +72,15 @@ GEM ansi (1.5.0) arel (7.1.4) attr_required (1.0.1) - autoprefixer-rails (7.1.1) + autoprefixer-rails (6.7.7.2) execjs - aws-sdk (2.9.27) - aws-sdk-resources (= 2.9.27) - aws-sdk-core (2.9.27) + aws-sdk (2.9.14) + aws-sdk-resources (= 2.9.14) + aws-sdk-core (2.9.14) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.9.27) - aws-sdk-core (= 2.9.27) + aws-sdk-resources (2.9.14) + aws-sdk-core (= 2.9.14) aws-sigv4 (1.0.0) axiom-types (0.1.1) descendants_tracker (~> 0.0.4) @@ -103,14 +103,14 @@ GEM breadcrumbs_on_rails (3.0.1) builder (3.2.3) byebug (9.0.6) - capybara (2.14.0) + capybara (2.13.0) addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - cells (4.1.7) + cells (4.1.6) declarative-builder (< 0.2.0) declarative-option (< 0.2.0) tilt (>= 1.4, < 3) @@ -118,13 +118,13 @@ GEM cells-haml (0.0.10) cells (>= 4.0.1, <= 6.0.0) haml (>= 4.1.0.beta.1) - cells-rails (0.0.8) + cells-rails (0.0.7) actionpack (>= 3.0) cells (>= 4.1.6, < 5.0.0) - childprocess (0.7.0) + childprocess (0.6.3) ffi (~> 1.0, >= 1.0.11) choice (0.2.0) - climate_control (0.2.0) + climate_control (0.1.0) cliver (0.3.2) cocaine (0.5.8) climate_control (>= 0.0.3, < 1.0) @@ -148,8 +148,8 @@ GEM rails (>= 4) react_on_rails (~> 6) shrine (~> 2.6) - database_cleaner (1.6.1) - debug_inspector (0.0.3) + database_cleaner (1.5.3) + debug_inspector (0.0.2) declarative-builder (0.1.0) declarative-option (< 0.2.0) declarative-option (0.1.0) @@ -166,13 +166,13 @@ GEM dialog-polyfill-rails (0.4.5.1) diff-lcs (1.3) docile (1.1.5) - doorkeeper (4.2.6) + doorkeeper (4.2.5) railties (>= 4.2) dotenv (2.2.1) dotenv-rails (2.2.1) dotenv (= 2.2.1) railties (>= 3.2, < 5.2) - down (3.0.0) + down (2.5.1) elasticsearch (5.0.4) elasticsearch-api (= 5.0.4) elasticsearch-transport (= 5.0.4) @@ -190,10 +190,10 @@ GEM elasticsearch-transport (5.0.4) faraday multi_json - email_spec (2.1.1) + email_spec (2.1.0) htmlentities (~> 4.3.3) launchy (~> 2.1) - mail (~> 2.6) + mail (~> 2.6.3) equalizer (0.0.11) erubis (2.7.0) excon (0.55.0) @@ -219,7 +219,7 @@ GEM flipper (~> 0.10.2) rack (>= 1.4, < 3) rack-protection (>= 1.5.3, < 2.1.0) - fog-core (1.44.3) + fog-core (1.44.1) builder excon (~> 0.49) formatador (~> 0.2) @@ -251,7 +251,7 @@ GEM grape-entity (0.6.1) activesupport (>= 5.0.0) multi_json (>= 1.3.2) - grape-swagger (0.27.2) + grape-swagger (0.27.1) grape (>= 0.16.2) guard (2.14.1) formatador (>= 0.2.4) @@ -275,7 +275,7 @@ GEM guard (~> 2.1) guard-compat (~> 1.1) rspec (>= 2.99.0, < 4.0) - haml (5.0.1) + haml (5.0.0) temple (>= 0.8.0) tilt hashie (3.5.5) @@ -284,9 +284,9 @@ GEM hashr (2.0.1) htmlentities (4.3.4) httpclient (2.8.3) - i18n (0.8.4) + i18n (0.8.1) ice_nine (0.11.2) - image_optim (0.24.3) + image_optim (0.24.2) exifr (~> 1.2, >= 1.2.2) fspath (~> 3.0) image_size (~> 1.5) @@ -299,15 +299,15 @@ GEM image_size (1.5.0) in_threads (1.4.0) interactor (3.1.0) - interactor-rails (2.1.1) + interactor-rails (2.0.2) interactor (~> 3.0) - rails (>= 4.2, < 5.2) + rails (>= 3, < 5.1) jasmine (2.6.0) jasmine-core (>= 2.6.0, < 3.0.0) phantomjs rack (>= 1.2.1) rake - jasmine-core (2.6.2) + jasmine-core (2.6.1) jasmine-rails (0.14.1) jasmine-core (>= 1.3, < 3.0) phantomjs (>= 1.9) @@ -324,7 +324,7 @@ GEM jquery-ui-rails (6.0.1) railties (>= 3.2.16) json (2.1.0) - json_spec (1.1.5) + json_spec (1.1.4) multi_json (~> 1.0) rspec (>= 2.0, < 4.0) jsonb_accessor (1.0.0.beta.6) @@ -343,12 +343,12 @@ GEM ruby_dep (~> 1.2) loofah (2.0.3) nokogiri (>= 1.5.9) - lumberjack (1.0.12) + lumberjack (1.0.11) mail (2.6.5) mime-types (>= 1.16, < 4) - material_design_lite-sass (1.3.0.1) - autoprefixer-rails (>= 6.5) - sass (>= 3.3) + material_design_lite-sass (1.3.0) + autoprefixer-rails (~> 6.0) + sass (~> 3.3) metaclass (0.0.4) method_source (0.8.2) mime-types (3.1) @@ -359,7 +359,7 @@ GEM mini_portile2 (2.1.0) mini_racer (0.1.9) libv8 (~> 5.3) - minitest (5.10.2) + minitest (5.10.1) mocha (1.2.1) metaclass (~> 0.0.1) multi_json (1.12.1) @@ -369,13 +369,13 @@ GEM mustermann-grape (1.0.0) mustermann (~> 1.0.0) nenv (0.3.0) - newrelic_rpm (4.2.0.334) + newrelic_rpm (4.1.0.333) ng-rails-csrf (0.1.0) ngannotate-rails (1.2.2) execjs rails (>= 3.1) - nio4r (2.1.0) - nokogiri (1.7.2) + nio4r (2.0.0) + nokogiri (1.7.1) mini_portile2 (~> 2.1.0) non-stupid-digest-assets (1.0.9) sprockets (>= 2.0) @@ -396,7 +396,7 @@ GEM activerecord (>= 4.0, < 5.2) pg (0.20.0) phantomjs (2.1.1.0) - poltergeist (1.15.0) + poltergeist (1.14.0) capybara (~> 2.1) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) @@ -420,7 +420,7 @@ GEM puma (3.8.2) pundit (1.1.0) activesupport (>= 3.0.0) - rack (2.0.3) + rack (2.0.1) rack-accept (0.4.5) rack (>= 0.4) rack-cors (0.4.1) @@ -430,35 +430,35 @@ GEM httpclient (>= 2.4) multi_json (>= 1.3.6) rack (>= 1.1) - rack-protection (2.0.0) + rack-protection (2.0.0.rc2) rack rack-test (0.6.3) rack (>= 1.0) - rails (5.0.3) - actioncable (= 5.0.3) - actionmailer (= 5.0.3) - actionpack (= 5.0.3) - actionview (= 5.0.3) - activejob (= 5.0.3) - activemodel (= 5.0.3) - activerecord (= 5.0.3) - activesupport (= 5.0.3) + rails (5.0.2) + actioncable (= 5.0.2) + actionmailer (= 5.0.2) + actionpack (= 5.0.2) + actionview (= 5.0.2) + activejob (= 5.0.2) + activemodel (= 5.0.2) + activerecord (= 5.0.2) + activesupport (= 5.0.2) bundler (>= 1.3.0, < 2.0) - railties (= 5.0.3) + railties (= 5.0.2) sprockets-rails (>= 2.0.0) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) - nokogiri (>= 1.6) - rails-erd (1.5.2) + rails-dom-testing (2.0.2) + activesupport (>= 4.2.0, < 6.0) + nokogiri (~> 1.6) + rails-erd (1.5.0) activerecord (>= 3.2) activesupport (>= 3.2) choice (~> 0.2.0) ruby-graphviz (~> 1.2) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - railties (5.0.3) - actionpack (= 5.0.3) - activesupport (= 5.0.3) + railties (5.0.2) + actionpack (= 5.0.2) + activesupport (= 5.0.2) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) @@ -498,42 +498,42 @@ GEM actionpack (>= 4.2.0, < 5.3) railties (>= 4.2.0, < 5.3) rolify (5.1.0) - rspec (3.6.0) - rspec-core (~> 3.6.0) - rspec-expectations (~> 3.6.0) - rspec-mocks (~> 3.6.0) - rspec-core (3.6.0) - rspec-support (~> 3.6.0) - rspec-expectations (3.6.0) + rspec (3.5.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-core (3.5.4) + rspec-support (~> 3.5.0) + rspec-expectations (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.6.0) - rspec-mocks (3.6.0) + rspec-support (~> 3.5.0) + rspec-mocks (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.6.0) - rspec-rails (3.6.0) + rspec-support (~> 3.5.0) + rspec-rails (3.5.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.6.0) - rspec-expectations (~> 3.6.0) - rspec-mocks (~> 3.6.0) - rspec-support (~> 3.6.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-support (~> 3.5.0) rspec-sidekiq (3.0.1) rspec-core (~> 3.0, >= 3.0.0) sidekiq (>= 2.4.0) - rspec-support (3.6.0) + rspec-support (3.5.0) ruby-graphviz (1.2.3) ruby-prof (0.16.2) ruby_dep (1.5.0) rubyzip (1.2.1) - sass (3.4.24) + sass (3.4.23) sass-rails (5.0.6) railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - sentry-raven (2.5.1) + sentry-raven (2.4.0) faraday (>= 0.7.6, < 1.0) shellany (0.0.1) shoulda-matchers (3.1.1) @@ -549,11 +549,11 @@ GEM docile (~> 1.1.0) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.1) - sinatra (2.0.0) - mustermann (~> 1.0) + simplecov-html (0.10.0) + sinatra (2.0.0.rc2) + mustermann (= 1.0.0) rack (~> 2.0) - rack-protection (= 2.0.0) + rack-protection (= 2.0.0.rc2) tilt (~> 2.0) six (0.2.0) slop (3.6.0) @@ -572,7 +572,7 @@ GEM transitions (1.2.1) turbolinks (5.0.1) turbolinks-source (~> 5) - turbolinks-source (5.0.3) + turbolinks-source (5.0.0) tzinfo (1.2.3) thread_safe (~> 0.1) uber (0.1.0) @@ -588,7 +588,7 @@ GEM websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) - xpath (2.1.0) + xpath (2.0.0) nokogiri (~> 1.3) yt (0.30.1) activesupport @@ -714,4 +714,4 @@ RUBY VERSION ruby 2.4.0p0 BUNDLED WITH - 1.14.3 + 1.14.6