Revert "Merge branch 'update_bootsnap_1.1.1' into 'master'"
This reverts commit83ec509ce4
, reversing changes made to57f0677ad8
.
This commit is contained in:
parent
03b0fe6df9
commit
97a6ec4aaa
4 changed files with 0 additions and 15 deletions
1
Gemfile
1
Gemfile
|
@ -2,7 +2,6 @@ source 'https://rubygems.org'
|
|||
|
||||
gem 'rails', '4.2.8'
|
||||
gem 'rails-deprecated_sanitizer', '~> 1.0.3'
|
||||
gem 'bootsnap', '~> 1.1'
|
||||
|
||||
# Responders respond_to and respond_with
|
||||
gem 'responders', '~> 2.0'
|
||||
|
|
|
@ -83,8 +83,6 @@ GEM
|
|||
bindata (2.3.5)
|
||||
binding_of_caller (0.7.2)
|
||||
debug_inspector (>= 0.0.1)
|
||||
bootsnap (1.1.1)
|
||||
msgpack (~> 1.0)
|
||||
bootstrap-sass (3.3.6)
|
||||
autoprefixer-rails (>= 5.2.1)
|
||||
sass (>= 3.3.4)
|
||||
|
@ -465,7 +463,6 @@ GEM
|
|||
minitest (5.7.0)
|
||||
mmap2 (2.2.7)
|
||||
mousetrap-rails (1.4.6)
|
||||
msgpack (1.1.0)
|
||||
multi_json (1.12.1)
|
||||
multi_xml (0.6.0)
|
||||
multipart-post (2.0.0)
|
||||
|
@ -930,7 +927,6 @@ DEPENDENCIES
|
|||
benchmark-ips (~> 2.3.0)
|
||||
better_errors (~> 2.1.0)
|
||||
binding_of_caller (~> 0.7.2)
|
||||
bootsnap (~> 1.1)
|
||||
bootstrap-sass (~> 3.3.0)
|
||||
bootstrap_form (~> 2.7.0)
|
||||
brakeman (~> 3.6.0)
|
||||
|
|
|
@ -1,4 +0,0 @@
|
|||
---
|
||||
title: Bump bootsnap to 1.1.1
|
||||
merge_request: 12425
|
||||
author: @blackst0ne
|
|
@ -5,12 +5,6 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
|
|||
|
||||
require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
|
||||
|
||||
begin
|
||||
require 'bootsnap/setup'
|
||||
rescue SystemCallError => exception
|
||||
$stderr.puts "WARNING: Bootsnap failed to setup: #{exception.message}"
|
||||
end
|
||||
|
||||
# set default directory for multiproces metrics gathering
|
||||
if ENV['RAILS_ENV'] == 'development' || ENV['RAILS_ENV'] == 'test'
|
||||
ENV['prometheus_multiproc_dir'] ||= 'tmp/prometheus_multiproc_dir'
|
||||
|
|
Loading…
Reference in a new issue