logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: c78e8c01a37c342977b35396007dce7f58052b20
parent: 0ec77c5b3ee78ea499eb4c118eea35703bb7e5b1
Author: Jack Jennings <jack@standard-library.com>
Date:   Thu, 11 May 2017 02:27:01 -0700

Add pessimistic constraints to gem versions (#2980)


Diffstat:

MGemfile156++++++++++++++++++++++++++++++++++++++++----------------------------------------
MGemfile.lock154++++++++++++++++++++++++++++++++++++++++----------------------------------------
2 files changed, 155 insertions(+), 155 deletions(-)

diff --git a/Gemfile b/Gemfile @@ -3,100 +3,100 @@ source 'https://rubygems.org' ruby '>= 2.3.0', '< 2.5.0' -gem 'pkg-config' +gem 'pkg-config', '~> 1.2' -gem 'puma' -gem 'rails', '~> 5.0.2' -gem 'uglifier', '>= 1.3.0' +gem 'puma', '~> 3.8' +gem 'rails', '~> 5.0' +gem 'uglifier', '~> 3.2' -gem 'hamlit-rails' -gem 'pg' -gem 'pghero' -gem 'dotenv-rails' +gem 'hamlit-rails', '~> 0.2' +gem 'pg', '~> 0.20' +gem 'pghero', '~> 1.7' +gem 'dotenv-rails', '~> 2.2' -gem 'aws-sdk', '>= 2.0' +gem 'aws-sdk', '~> 2.9' gem 'paperclip', '~> 5.1' -gem 'paperclip-av-transcoder' +gem 'paperclip-av-transcoder', '~> 0.6' -gem 'addressable' -gem 'cld3', '~> 3.1.0' -gem 'devise' -gem 'devise-two-factor' -gem 'doorkeeper' -gem 'fast_blank' -gem 'goldfinger' -gem 'hiredis' -gem 'redis-namespace' -gem 'htmlentities' -gem 'http' -gem 'http_accept_language' -gem 'httplog' -gem 'kaminari' -gem 'link_header' -gem 'nokogiri' -gem 'oj' +gem 'addressable', '~> 2.5' +gem 'cld3', '~> 3.1' +gem 'devise', '~> 4.2' +gem 'devise-two-factor', '~> 3.0' +gem 'doorkeeper', '~> 4.2' +gem 'fast_blank', '~> 1.0' +gem 'goldfinger', '~> 1.2' +gem 'hiredis', '~> 0.6' +gem 'redis-namespace', '~> 1.5' +gem 'htmlentities', '~> 4.3' +gem 'http', '~> 2.2' +gem 'http_accept_language', '~> 2.1' +gem 'httplog', '~> 0.99' +gem 'kaminari', '~> 1.0' +gem 'link_header', '~> 0.0' +gem 'nokogiri', '~> 1.7' +gem 'oj', '~> 3.0' gem 'ostatus2', '~> 2.0' -gem 'ox' -gem 'rabl' -gem 'rack-attack' -gem 'rack-cors', require: 'rack/cors' -gem 'rack-timeout' -gem 'rails-i18n' -gem 'rails-settings-cached' -gem 'redis', '~>3.2', require: ['redis', 'redis/connection/hiredis'] -gem 'rqrcode' -gem 'ruby-oembed', require: 'oembed' -gem 'sanitize' -gem 'sidekiq' -gem 'sidekiq-scheduler' -gem 'sidekiq-unique-jobs' -gem 'simple-navigation' -gem 'simple_form' -gem 'sprockets-rails', require: 'sprockets/railtie' -gem 'statsd-instrument' -gem 'twitter-text' -gem 'tzinfo-data' -gem 'webpacker', '~>1.2' +gem 'ox', '~> 2.5' +gem 'rabl', '~> 0.13' +gem 'rack-attack', '~> 5.0' +gem 'rack-cors', '~> 0.4', require: 'rack/cors' +gem 'rack-timeout', '~> 0.4' +gem 'rails-i18n', '~> 5.0' +gem 'rails-settings-cached', '~> 0.6' +gem 'redis', '~> 3.3', require: ['redis', 'redis/connection/hiredis'] +gem 'rqrcode', '~> 0.10' +gem 'ruby-oembed', '~> 0.12', require: 'oembed' +gem 'sanitize', '~> 4.4' +gem 'sidekiq', '~> 5.0' +gem 'sidekiq-scheduler', '~> 2.1' +gem 'sidekiq-unique-jobs', '~> 5.0' +gem 'simple-navigation', '~> 4.0' +gem 'simple_form', '~> 3.4' +gem 'sprockets-rails', '~> 3.2', require: 'sprockets/railtie' +gem 'statsd-instrument', '~> 2.1' +gem 'twitter-text', '~> 1.14' +gem 'tzinfo-data', '~> 1.2017' +gem 'webpacker', '~> 1.2' group :development, :test do - gem 'fabrication' - gem 'fuubar' - gem 'i18n-tasks' - gem 'pry-rails' - gem 'rspec-rails' + gem 'fabrication', '~> 2.16' + gem 'fuubar', '~> 2.2' + gem 'i18n-tasks', '~> 0.9' + gem 'pry-rails', '~> 0.3' + gem 'rspec-rails', '~> 3.6' end group :test do - gem 'capybara' - gem 'faker' - gem 'microformats2' - gem 'rails-controller-testing' - gem 'rspec-sidekiq' - gem 'simplecov', require: false - gem 'webmock' - gem 'parallel_tests' + gem 'capybara', '~> 2.14' + gem 'faker', '~> 1.7' + gem 'microformats2', '~> 2.1' + gem 'rails-controller-testing', '~> 1.0' + gem 'rspec-sidekiq', '~> 3.0' + gem 'simplecov', '~> 0.14', require: false + gem 'webmock', '~> 3.0' + gem 'parallel_tests', '~> 2.14' end group :development do - gem 'active_record_query_trace' - gem 'annotate' - gem 'better_errors' - gem 'binding_of_caller' - gem 'bullet' - gem 'letter_opener' - gem 'letter_opener_web' - gem 'rubocop', require: false - gem 'brakeman', '~> 3.6.0', require: false - gem 'bundler-audit', require: false - gem 'scss_lint', require: false + gem 'active_record_query_trace', '~> 1.5' + gem 'annotate', '~> 2.7' + gem 'better_errors', '~> 2.1' + gem 'binding_of_caller', '~> 0.7' + gem 'bullet', '~> 5.5' + gem 'letter_opener', '~> 1.4' + gem 'letter_opener_web', '~> 1.3' + gem 'rubocop', '~> 0.48', require: false + gem 'brakeman', '~> 3.6', require: false + gem 'bundler-audit', '~> 0.5', require: false + gem 'scss_lint', '~> 0.53', require: false - gem 'capistrano', '3.8.0' - gem 'capistrano-rails' - gem 'capistrano-rbenv' - gem 'capistrano-yarn' + gem 'capistrano', '~> 3.8' + gem 'capistrano-rails', '~> 1.2' + gem 'capistrano-rbenv', '~> 2.1' + gem 'capistrano-yarn', '~> 2.0' end group :production do - gem 'lograge' - gem 'redis-rails' + gem 'lograge', '~> 0.5' + gem 'redis-rails', '~> 5.0' end diff --git a/Gemfile.lock b/Gemfile.lock @@ -466,85 +466,85 @@ PLATFORMS ruby DEPENDENCIES - active_record_query_trace - addressable - annotate - aws-sdk (>= 2.0) - better_errors - binding_of_caller - brakeman (~> 3.6.0) - bullet - bundler-audit - capistrano (= 3.8.0) - capistrano-rails - capistrano-rbenv - capistrano-yarn - capybara - cld3 (~> 3.1.0) - devise - devise-two-factor - doorkeeper - dotenv-rails - fabrication - faker - fast_blank - fuubar - goldfinger - hamlit-rails - hiredis - htmlentities - http - http_accept_language - httplog - i18n-tasks - kaminari - letter_opener - letter_opener_web - link_header - lograge - microformats2 - nokogiri - oj + active_record_query_trace (~> 1.5) + addressable (~> 2.5) + annotate (~> 2.7) + aws-sdk (~> 2.9) + better_errors (~> 2.1) + binding_of_caller (~> 0.7) + brakeman (~> 3.6) + bullet (~> 5.5) + bundler-audit (~> 0.5) + capistrano (~> 3.8) + capistrano-rails (~> 1.2) + capistrano-rbenv (~> 2.1) + capistrano-yarn (~> 2.0) + capybara (~> 2.14) + cld3 (~> 3.1) + devise (~> 4.2) + devise-two-factor (~> 3.0) + doorkeeper (~> 4.2) + dotenv-rails (~> 2.2) + fabrication (~> 2.16) + faker (~> 1.7) + fast_blank (~> 1.0) + fuubar (~> 2.2) + goldfinger (~> 1.2) + hamlit-rails (~> 0.2) + hiredis (~> 0.6) + htmlentities (~> 4.3) + http (~> 2.2) + http_accept_language (~> 2.1) + httplog (~> 0.99) + i18n-tasks (~> 0.9) + kaminari (~> 1.0) + letter_opener (~> 1.4) + letter_opener_web (~> 1.3) + link_header (~> 0.0) + lograge (~> 0.5) + microformats2 (~> 2.1) + nokogiri (~> 1.7) + oj (~> 3.0) ostatus2 (~> 2.0) - ox + ox (~> 2.5) paperclip (~> 5.1) - paperclip-av-transcoder - parallel_tests - pg - pghero - pkg-config - pry-rails - puma - rabl - rack-attack - rack-cors - rack-timeout - rails (~> 5.0.2) - rails-controller-testing - rails-i18n - rails-settings-cached - redis (~> 3.2) - redis-namespace - redis-rails - rqrcode - rspec-rails - rspec-sidekiq - rubocop - ruby-oembed - sanitize - scss_lint - sidekiq - sidekiq-scheduler - sidekiq-unique-jobs - simple-navigation - simple_form - simplecov - sprockets-rails - statsd-instrument - twitter-text - tzinfo-data - uglifier (>= 1.3.0) - webmock + paperclip-av-transcoder (~> 0.6) + parallel_tests (~> 2.14) + pg (~> 0.20) + pghero (~> 1.7) + pkg-config (~> 1.2) + pry-rails (~> 0.3) + puma (~> 3.8) + rabl (~> 0.13) + rack-attack (~> 5.0) + rack-cors (~> 0.4) + rack-timeout (~> 0.4) + rails (~> 5.0) + rails-controller-testing (~> 1.0) + rails-i18n (~> 5.0) + rails-settings-cached (~> 0.6) + redis (~> 3.3) + redis-namespace (~> 1.5) + redis-rails (~> 5.0) + rqrcode (~> 0.10) + rspec-rails (~> 3.6) + rspec-sidekiq (~> 3.0) + rubocop (~> 0.48) + ruby-oembed (~> 0.12) + sanitize (~> 4.4) + scss_lint (~> 0.53) + sidekiq (~> 5.0) + sidekiq-scheduler (~> 2.1) + sidekiq-unique-jobs (~> 5.0) + simple-navigation (~> 4.0) + simple_form (~> 3.4) + simplecov (~> 0.14) + sprockets-rails (~> 3.2) + statsd-instrument (~> 2.1) + twitter-text (~> 1.14) + tzinfo-data (~> 1.2017) + uglifier (~> 3.2) + webmock (~> 3.0) webpacker (~> 1.2) RUBY VERSION