Merge pull request #5447 from opf/fix/bump_gems

[ci skip]
8 years ago · f3c1b9562f
parent c9bd9c238e fdcd122c7e
commit f3c1b9562f
3 changed files with 42 additions and 40 deletions
--- a/17
+++ b/17
@ -35,7 +35,7 @@ gem 'rails', '~> 5.0.2'
 gem 'actionpack-xml_parser', '~> 2.0.0'
 gem 'activemodel-serializers-xml', '~> 1.0.1'
 gem 'activerecord-session_store', '~> 1.0.0'
-gem 'responders', '~> 2.3'
+gem 'responders', '~> 2.4'

 gem 'coderay', '~> 1.1.0'
 gem 'rubytree', '~> 0.9.7'
@ -90,10 +90,10 @@ gem 'bcrypt', '~> 3.1.6'
 # See: config/initializers/rabl_hack.rb
 gem 'rabl', '~> 0.13.0'
 gem 'multi_json', '~> 1.12.1'
-gem 'oj', '~> 2.18.5'
+gem 'oj', '~> 3.0.5'

-gem 'delayed_job_active_record', '~> 4.1.1'
 gem 'daemons'
+gem 'delayed_job_active_record', '~> 4.1.1'

 gem 'rack-protection', '~> 2.0.0.beta2'

@ -106,8 +106,8 @@ gem 'rack-attack', '~> 5.0.1'
 # Patch Rails HTML whitelisting for Angular curly braces
 gem 'rails-angular-xss', git: 'https://github.com/opf/rails-angular-xss', ref: 'a45267d5'

+gem 'gon', '~> 6.1.0'
 gem "syck", '~> 1.0.5', require: false
-gem 'gon', '~> 4.0'

 # catch exceptions and send them to any airbrake compatible backend
 # don't require by default, instead load on-demand when actually configured
@ -135,7 +135,7 @@ end
 gem 'sprockets', '~> 3.7.0'
 gem 'sass-rails', '~> 5.0.6'
 gem 'sass', '3.5.0.pre.rc.1'
-gem 'autoprefixer-rails', '~> 6.7.7.1'
+gem 'autoprefixer-rails', '~> 6.7.7.2'
 gem 'bourbon', '~> 4.3.4'
 gem 'i18n-js', '~> 3.0.0'

@ -172,6 +172,7 @@ group :test do
  gem 'cucumber-rails', '~> 1.4.4', require: false
  gem 'rack_session_access'
  gem 'database_cleaner', '~> 1.5.3'
+  # not possible to upgrade to 3.6+ until rails is 5.1+
  gem 'rspec', '~> 3.5.0'
  # also add to development group, so "spec" rake task gets loaded
  gem 'rspec-rails', '~> 3.5.2', group: :development
@ -197,14 +198,14 @@ group :test do
  gem 'capybara-ng', '~> 0.2.7'
  gem 'selenium-webdriver', '~> 2.53.4'
  gem 'timecop', '~> 0.8.1'
-  gem 'webmock', '~> 2.1.0', require: false
+  gem 'webmock', '~> 3.0.0', require: false

  gem 'simplecov', '~> 0.12.0', require: false
  gem 'shoulda-matchers', '~> 3.1', require: nil
  gem 'json_spec', '~> 1.1.4'
  gem 'equivalent-xml', '~> 0.6'

-  gem 'parallel_tests', '~> 2.4.1'
+  gem 'parallel_tests', '~> 2.14.0'
 end

 group :ldap do
@ -232,7 +233,7 @@ group :development, :test do
 end

 # API gems
-gem 'grape', '~> 0.19.1'
+gem 'grape', '~> 0.19.2'
 gem 'grape-cache_control', '~> 1.0.1'

 gem 'roar',   '~> 1.0.0'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -161,7 +161,7 @@ GEM
    airbrake-ruby (1.5.0)
    arel (7.1.4)
    ast (2.3.0)
-    autoprefixer-rails (6.7.7.1)
+    autoprefixer-rails (6.7.7.2)
      execjs
    awesome_nested_set (3.1.2)
      activerecord (>= 4.0.0, < 5.1)
@ -222,9 +222,9 @@ GEM
      multi_test (>= 0.1.2)
    cucumber-core (1.5.0)
      gherkin (~> 4.0)
-    cucumber-rails (1.4.4)
+    cucumber-rails (1.4.5)
      capybara (>= 1.1.2, < 3)
-      cucumber (>= 1.3.8, < 3)
+      cucumber (>= 1.3.8, < 4)
      mime-types (>= 1.16, < 4)
      nokogiri (~> 1.5)
      railties (>= 3, < 5.1)
@ -243,7 +243,7 @@ GEM
      delayed_job (>= 3.0, < 5)
    descendants_tracker (0.0.4)
      thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
    disposable (0.0.9)
      representable (~> 2.0)
      uber
@ -286,26 +286,28 @@ GEM
      rspec-core (~> 3.0)
      ruby-progressbar (~> 1.4)
    get_process_mem (0.2.1)
-    gherkin (4.0.0)
+    gherkin (4.1.3)
    globalid (0.3.7)
      activesupport (>= 4.1.0)
-    gon (4.1.1)
-      actionpack (>= 2.3.0)
+    gon (6.1.0)
+      actionpack (>= 3.0)
      json
-    grape (0.19.1)
+      multi_json
+      request_store (>= 1.0)
+    grape (0.19.2)
      activesupport
      builder
      hashie (>= 2.1.0)
      multi_json (>= 1.3.2)
      multi_xml (>= 0.5.2)
-      mustermann-grape (~> 0.4.0)
+      mustermann-grape (~> 1.0.0)
      rack (>= 1.3.0)
      rack-accept
      virtus (>= 1.0.0)
    grape-cache_control (1.0.1)
      grape (~> 0.3)
    gravatar_image_tag (1.2.0)
-    hashdiff (0.3.0)
+    hashdiff (0.3.4)
    hashie (3.5.5)
    health_check (2.6.0)
      rails (>= 4.0)
@ -347,26 +349,25 @@ GEM
    multi_json (1.12.1)
    multi_test (0.1.2)
    multi_xml (0.6.0)
-    mustermann (0.4.0)
-      tool (~> 0.2)
-    mustermann-grape (0.4.0)
-      mustermann (= 0.4.0)
-    mysql2 (0.4.5)
+    mustermann (1.0.0)
+    mustermann-grape (1.0.0)
+      mustermann (~> 1.0.0)
+    mysql2 (0.4.6)
    net-ldap (0.16.0)
    netrc (0.11.0)
-    newrelic_rpm (4.0.0.332)
+    newrelic_rpm (4.1.0.333)
    nio4r (2.0.0)
    nokogiri (1.7.1)
      mini_portile2 (~> 2.1.0)
-    oj (2.18.5)
+    oj (3.0.5)
    openproject-token (1.0.0)
      activemodel (~> 5.0)
-    parallel (1.9.0)
-    parallel_tests (2.4.1)
+    parallel (1.11.1)
+    parallel_tests (2.14.1)
      parallel
    parser (2.4.0.0)
      ast (~> 2.2)
-    passenger (5.0.30)
+    passenger (5.1.3)
      rack
      rake (>= 0.8.1)
    pdf-core (0.7.0)
@ -458,8 +459,9 @@ GEM
      nokogiri
      uber (~> 0.0.7)
    request_store (1.3.2)
-    responders (2.3.0)
-      railties (>= 4.2.0, < 5.1)
+    responders (2.4.0)
+      actionpack (>= 4.2.0, < 5.3)
+      railties (>= 4.2.0, < 5.3)
    rest-client (1.8.0)
      http-cookie (>= 1.0.2, < 2.0)
      mime-types (>= 1.16, < 3.0)
@ -554,7 +556,6 @@ GEM
    thread_safe (0.3.6)
    tilt (2.0.5)
    timecop (0.8.1)
-    tool (0.2.3)
    ttfunk (1.5.0)
    tzinfo (1.2.3)
      thread_safe (~> 0.1)
@ -580,7 +581,7 @@ GEM
      rack (>= 1.0)
    warden-basic_auth (0.2.1)
      warden (~> 1.2)
-    webmock (2.1.0)
+    webmock (3.0.1)
      addressable (>= 2.3.6)
      crack (>= 0.3.2)
      hashdiff
@ -606,7 +607,7 @@ DEPENDENCIES
  acts_as_list (~> 0.9.5)
  acts_as_tree (~> 2.6.1)
  airbrake (~> 5.1.0)
-  autoprefixer-rails (~> 6.7.7.1)
+  autoprefixer-rails (~> 6.7.7.2)
  awesome_nested_set (~> 3.1.1)
  bcrypt (~> 3.1.6)
  bourbon (~> 4.3.4)
@ -635,8 +636,8 @@ DEPENDENCIES
  friendly_id!
  fuubar (~> 2.2.0)
  globalize!
-  gon (~> 4.0)
-  grape (~> 0.19.1)
+  gon (~> 6.1.0)
+  grape (~> 0.19.2)
  grape-cache_control (~> 1.0.1)
  gravatar_image_tag (~> 1.2.0)
  health_check
@ -652,11 +653,11 @@ DEPENDENCIES
  net-ldap (~> 0.16.0)
  newrelic_rpm
  nokogiri (~> 1.7.1)
-  oj (~> 2.18.5)
+  oj (~> 3.0.5)
  omniauth!
  openproject-token (~> 1.0.0)
  openproject-translations!
-  parallel_tests (~> 2.4.1)
+  parallel_tests (~> 2.14.0)
  passenger
  pg (~> 0.20.0)
  prawn (~> 2.2)
@ -679,7 +680,7 @@ DEPENDENCIES
  rdoc (>= 2.4.2)
  reform (~> 1.2.6)
  request_store (~> 1.3.1)
-  responders (~> 2.3)
+  responders (~> 2.4)
  retriable (~> 2.1)
  roar (~> 1.0.0)
  rspec (~> 3.5.0)
@ -712,7 +713,7 @@ DEPENDENCIES
  unicorn-worker-killer
  warden (~> 1.2)
  warden-basic_auth (~> 0.2.1)
-  webmock (~> 2.1.0)
+  webmock (~> 3.0.0)
  will_paginate (~> 3.1.0)

 RUBY VERSION
--- a/app/helpers/timelines_helper.rb
+++ b/app/helpers/timelines_helper.rb
@ -157,7 +157,7 @@ module TimelinesHelper
    end
  end

-  include Gon::GonHelpers
+  include Gon::ControllerHelpers

  def push_visible_timelines(visible_timelines, target = gon)
    target.timelines = visible_timelines.map { |timeline|