From bc172ead8d81f4147ef8e21f2a6855f8bdced9b8 Mon Sep 17 00:00:00 2001 From: Ralf Teusner Date: Tue, 30 Jan 2018 18:06:26 +0100 Subject: [PATCH] update again, prevent pg from being updated --- Gemfile | 2 +- Gemfile.lock | 87 ++++++++++++++++++++++++++-------------------------- 2 files changed, 44 insertions(+), 45 deletions(-) diff --git a/Gemfile b/Gemfile index 951d5774..4590d3b8 100644 --- a/Gemfile +++ b/Gemfile @@ -17,7 +17,7 @@ gem 'jquery-turbolinks' gem 'ims-lti', '~> 1.1.0' gem 'kramdown' gem 'newrelic_rpm' -gem 'pg', platform: :ruby +gem 'pg', '< 1.0', platform: :ruby gem 'pry-byebug' gem 'puma', '~> 2.15.3' gem 'pundit' diff --git a/Gemfile.lock b/Gemfile.lock index 1e39da0f..a924c491 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -45,7 +45,7 @@ GEM addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) arel (6.0.4) - ast (2.3.0) + ast (2.4.0) autotest-rails (4.2.1) ZenTest (~> 4.5) bcrypt (3.1.11) @@ -54,7 +54,7 @@ GEM coderay (>= 1.0.0) erubi (>= 1.0.0) rack (>= 0.9.0) - binding_of_caller (0.7.3) + binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) bootstrap-will_paginate (1.0.0) will_paginate @@ -77,26 +77,26 @@ GEM capistrano (~> 3.0) sshkit (~> 1.2) capistrano-stats (1.1.1) - capistrano-upload-config (0.7.0) + capistrano-upload-config (0.8.2) capistrano (>= 3.0) capistrano3-puma (1.2.1) capistrano (~> 3.0) puma (>= 2.6) - capybara (2.16.1) + capybara (2.17.0) addressable mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) - xpath (~> 2.0) - carrierwave (1.2.1) + xpath (>= 2.0, < 4.0) + carrierwave (1.2.2) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) childprocess (0.8.0) ffi (~> 1.0, >= 1.0.11) - codeclimate-test-reporter (1.0.8) - simplecov (<= 0.13) + codeclimate-test-reporter (1.0.7) + simplecov coderay (1.1.2) coffee-rails (4.0.1) coffee-script (>= 2.2.0) @@ -125,7 +125,7 @@ GEM erubis (2.7.0) eventmachine (1.2.5) eventmachine (1.2.5-java) - excon (0.59.0) + excon (0.60.0) execjs (2.7.0) factory_bot (4.8.2) activesupport (>= 3.0.0) @@ -139,14 +139,14 @@ GEM websocket-driver (>= 0.5.1) ffi (1.9.18) ffi (1.9.18-java) - forgery (0.6.0) + forgery (0.7.0) globalid (0.4.1) activesupport (>= 4.2.0) highline (1.7.10) hike (1.2.3) http-cookie (1.0.3) domain_name (~> 0.5) - i18n (0.9.1) + i18n (0.9.3) concurrent-ruby (~> 1.0) ims-lti (1.1.13) builder @@ -165,7 +165,7 @@ GEM json (1.8.6) json (1.8.6-java) jwt (1.5.6) - kramdown (1.15.0) + kramdown (1.16.2) loofah (2.1.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) @@ -177,21 +177,21 @@ GEM mime-types-data (3.2016.0521) mini_mime (1.0.0) mini_portile2 (2.3.0) - minitest (5.10.3) - multi_json (1.12.2) + minitest (5.11.3) + multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) net-scp (1.2.1) net-ssh (>= 2.6.5) net-ssh (4.2.0) netrc (0.11.0) - newrelic_rpm (4.6.0.338) - nokogiri (1.8.1) + newrelic_rpm (4.7.1.340) + nokogiri (1.8.2) mini_portile2 (~> 2.3.0) - nokogiri (1.8.1-java) + nokogiri (1.8.2-java) nyan-cat-formatter (0.12.0) rspec (>= 2.99, >= 2.14.2, < 4) - oauth (0.5.3) + oauth (0.5.4) oauth2 (1.4.0) faraday (>= 0.8, < 0.13) jwt (~> 1.0) @@ -200,11 +200,11 @@ GEM rack (>= 1.2, < 3) pagedown-rails (1.1.4) railties (> 3.1) - parallel (1.12.0) + parallel (1.12.1) parser (2.4.0.2) ast (~> 2.3) pg (0.21.0) - polyamorous (1.3.1) + polyamorous (1.3.3) activerecord (>= 3.0) powerpack (0.1.1) pry (0.11.3) @@ -214,7 +214,7 @@ GEM coderay (~> 1.1.0) method_source (~> 0.9.0) spoon (~> 0.0) - pry-byebug (3.5.0) + pry-byebug (3.5.1) byebug (~> 9.1) pry (~> 0.10) public_suffix (3.0.1) @@ -240,8 +240,8 @@ GEM sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.8) - activesupport (>= 4.2.0.beta, < 5.0) + 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.3) @@ -254,15 +254,14 @@ GEM activesupport (= 4.2.5) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rainbow (2.2.2) - rake + rainbow (3.0.0) rake (12.3.0) - ransack (1.8.4) + ransack (1.8.6) actionpack (>= 3.0) activerecord (>= 3.0) activesupport (>= 3.0) i18n - polyamorous (~> 1.3) + polyamorous (~> 1.3.2) rdoc (4.3.0) rest-client (2.0.2) http-cookie (>= 1.0.2, < 2.0) @@ -274,7 +273,7 @@ GEM rspec-mocks (~> 3.7.0) rspec-autotest (1.0.0) rspec-core (>= 2.99.0.beta1, < 4.0.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) @@ -290,16 +289,16 @@ GEM rspec-expectations (~> 3.7.0) rspec-mocks (~> 3.7.0) rspec-support (~> 3.7.0) - rspec-support (3.7.0) - rubocop (0.51.0) + rspec-support (3.7.1) + rubocop (0.52.1) parallel (~> 1.10) - parser (>= 2.3.3.1, < 3.0) + parser (>= 2.4.0.2, < 3.0) powerpack (~> 0.1) - rainbow (>= 2.2.2, < 3.0) + rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) - rubocop-rspec (1.20.1) - rubocop (>= 0.51.0) + rubocop-rspec (1.22.1) + rubocop (>= 0.52.1) ruby-progressbar (1.9.0) rubytree (0.9.7) json (~> 1.8) @@ -314,10 +313,10 @@ GEM sdoc (0.4.2) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) - selenium-webdriver (3.7.0) + selenium-webdriver (3.8.0) childprocess (~> 0.5) rubyzip (~> 1.0) - simplecov (0.13.0) + simplecov (0.15.1) docile (~> 1.1.0) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) @@ -354,12 +353,12 @@ GEM tubesock (0.2.7) rack (>= 1.5.0) websocket (>= 1.1.0) - turbolinks (5.0.1) - turbolinks-source (~> 5) - turbolinks-source (5.0.3) + turbolinks (5.1.0) + turbolinks-source (~> 5.1) + turbolinks-source (5.1.0) tzinfo (1.2.4) thread_safe (~> 0.1) - uglifier (3.2.0) + uglifier (4.1.5) execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext @@ -378,8 +377,8 @@ GEM websocket-extensions (>= 0.1.0) websocket-extensions (0.1.3) will_paginate (3.1.6) - xpath (2.1.0) - nokogiri (~> 1.3) + xpath (3.0.0) + nokogiri (~> 1.8) PLATFORMS java @@ -421,7 +420,7 @@ DEPENDENCIES nokogiri nyan-cat-formatter pagedown-rails (~> 1.1.4) - pg + pg (< 1.0) pry-byebug puma (~> 2.15.3) pundit @@ -452,4 +451,4 @@ DEPENDENCIES will_paginate (~> 3.0) BUNDLED WITH - 1.15.4 + 1.16.1