diff options
author | ThibG <thib@sitedethib.com> | 2018-11-09 22:29:52 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-09 22:29:52 +0100 |
commit | 09562b0fcc193d66f89a9f2c7eb2684e2e554d83 (patch) | |
tree | 87747f5dda99de033d15ec1319a7c188fa0df750 /Gemfile.lock | |
parent | 868cace7975532509c41800c7b6b9a6c7838a6b0 (diff) | |
parent | c6fc3e0c65a0ae78e76ebb5da1a12a23727b72c8 (diff) |
Merge pull request #806 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 44 |
1 files changed, 21 insertions, 23 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 59b018e0f..3737f2299 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,7 +38,7 @@ GEM erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - active_model_serializers (0.10.7) + active_model_serializers (0.10.8) actionpack (>= 4.1, < 6) activemodel (>= 4.1, < 6) case_transform (>= 0.2) @@ -76,8 +76,8 @@ GEM av (0.9.0) cocaine (~> 0.5.3) aws-eventstream (1.0.1) - aws-partitions (1.106.0) - aws-sdk-core (3.35.0) + aws-partitions (1.107.0) + aws-sdk-core (3.36.0) aws-eventstream (~> 1.0) aws-partitions (~> 1.0) aws-sigv4 (~> 1.0) @@ -85,7 +85,7 @@ GEM aws-sdk-kms (1.11.0) aws-sdk-core (~> 3, >= 3.26.0) aws-sigv4 (~> 1.0) - aws-sdk-s3 (1.23.0) + aws-sdk-s3 (1.23.1) aws-sdk-core (~> 3, >= 3.26.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.0) @@ -103,9 +103,9 @@ GEM brakeman (4.3.1) browser (2.5.3) builder (3.2.3) - bullet (5.7.6) + bullet (5.8.1) activesupport (>= 3.0.0) - uniform_notifier (~> 1.11.0) + uniform_notifier (~> 1.11) bundler-audit (0.6.0) bundler (~> 1.2) thor (~> 0.18) @@ -126,7 +126,7 @@ GEM sshkit (~> 1.3) capistrano-yarn (2.0.2) capistrano (~> 3.0) - capybara (3.10.0) + capybara (3.10.1) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) @@ -254,8 +254,7 @@ GEM hashie (3.5.7) heapy (0.1.4) highline (2.0.0) - hiredis (0.6.1) - hitimes (1.3.0) + hiredis (0.6.3) hkdf (0.3.0) html2text (0.2.1) nokogiri (~> 1.6) @@ -333,7 +332,7 @@ GEM mario-redis-lock (1.2.1) redis (>= 3.0.5) memory_profiler (0.9.12) - method_source (0.9.0) + method_source (0.9.1) microformats (4.0.7) json nokogiri @@ -389,7 +388,7 @@ GEM av (~> 0.9.0) paperclip (>= 2.5.2) parallel (1.12.1) - parallel_tests (2.26.0) + parallel_tests (2.26.2) parallel parser (2.5.3.0) ast (~> 2.4.0) @@ -399,7 +398,7 @@ GEM pg (1.1.3) pghero (2.2.0) activerecord - pkg-config (1.3.1) + pkg-config (1.3.2) powerpack (0.1.2) premailer (1.11.1) addressable @@ -409,21 +408,21 @@ GEM actionmailer (>= 3, < 6) premailer (~> 1.7, >= 1.7.9) private_address_check (0.5.0) - pry (0.11.3) + pry (0.12.0) coderay (~> 1.1.0) method_source (~> 0.9.0) pry-byebug (3.6.0) byebug (~> 10.0) pry (~> 0.10) - pry-rails (0.3.6) + pry-rails (0.3.7) pry (>= 0.10.4) public_suffix (3.0.3) puma (3.12.0) pundit (2.0.0) activesupport (>= 3.0.0) raabro (1.1.6) - rack (2.0.5) - rack-attack (5.4.1) + rack (2.0.6) + rack-attack (5.4.2) rack (>= 1.0, < 3) rack-cors (1.0.2) rack-protection (2.0.4) @@ -475,7 +474,7 @@ GEM link_header (~> 0.0, >= 0.0.8) rdf-normalize (0.3.3) rdf (>= 2.2, < 4.0) - redis (4.0.2) + redis (4.0.3) redis-actionpack (5.0.2) actionpack (>= 4.0, < 6) redis-rack (>= 1, < 3) @@ -550,7 +549,7 @@ GEM scss_lint (0.57.1) rake (>= 0.9, < 13) sass (~> 3.5, >= 3.5.5) - sidekiq (5.2.2) + sidekiq (5.2.3) connection_pool (~> 2.2, >= 2.2.2) rack-protection (>= 1.5.0) redis (>= 3.3.5, < 5) @@ -600,13 +599,12 @@ GEM thor (0.20.0) thread_safe (0.3.6) tilt (2.0.8) - timers (4.1.2) - hitimes + timers (4.2.0) tty-color (0.4.3) tty-command (0.8.2) pastel (~> 0.7.0) tty-cursor (0.6.0) - tty-prompt (0.17.1) + tty-prompt (0.17.2) necromancer (~> 0.4.0) pastel (~> 0.7.0) timers (~> 4.0) @@ -627,7 +625,7 @@ GEM unf_ext unf_ext (0.0.7.5) unicode-display_width (1.4.0) - uniform_notifier (1.11.0) + uniform_notifier (1.12.1) warden (1.2.7) rack (>= 1.0) webmock (3.4.2) @@ -662,7 +660,7 @@ DEPENDENCIES bootsnap (~> 1.3) brakeman (~> 4.3) browser - bullet (~> 5.7) + bullet (~> 5.8) bundler-audit (~> 0.6) capistrano (~> 3.11) capistrano-rails (~> 1.4) |