Browse Source

Bundle update

remotes/origin/master
echarp 2 years ago
parent
commit
2d7ff9bacc
  1. 4
      Gemfile
  2. 17
      Gemfile.lock
  3. 2
      Guardfile
  4. 2
      db/migrate/20170508142601_add_parent_region_to_region.rb

4
Gemfile

@ -83,7 +83,7 @@ group :development do
gem 'listen', '>= 3.0.5', '< 3.2'
# Access an IRB console on exception pages or by using <%= console %>
# anywhere in the code.
gem 'web-console', '>= 3.3.0'
gem 'web-console'
# Spring speeds up development by keeping your application
# running in the background. Read more:
# https://github.com/rails/spring
@ -91,7 +91,7 @@ group :development do
gem 'spring-watcher-listen', '~> 2.0.0'
# Use Puma as the app server
gem 'puma', '~> 3.7'
gem 'puma'
# Scanning the Gemfile for insecure dependencies based on published CVEs
gem 'bundler-audit'

17
Gemfile.lock

@ -293,8 +293,9 @@ GEM
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
public_suffix (3.1.0)
puma (3.12.1)
public_suffix (3.1.1)
puma (4.0.0)
nio4r (~> 2.0)
rack (2.0.7)
rack-livereload (0.3.17)
rack
@ -356,7 +357,7 @@ GEM
responders (2.4.1)
actionpack (>= 4.2.0, < 6.0)
railties (>= 4.2.0, < 6.0)
rubocop (0.71.0)
rubocop (0.72.0)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.6)
@ -365,9 +366,9 @@ GEM
unicode-display_width (>= 1.4.0, < 1.7)
rubocop-performance (1.4.0)
rubocop (>= 0.71.0)
rubocop-rails (2.0.1)
rubocop-rails (2.1.0)
rack (>= 1.1)
rubocop (>= 0.70.0)
rubocop (>= 0.72.0)
ruby-progressbar (1.10.1)
ruby_dep (1.5.0)
ruby_parser (3.13.1)
@ -423,7 +424,7 @@ GEM
thor (0.20.3)
thread_safe (0.3.6)
tilt (2.0.9)
tinymce-rails (5.0.5)
tinymce-rails (5.0.9)
railties (>= 3.1.1)
turbolinks (5.2.0)
turbolinks-source (~> 5.2)
@ -504,7 +505,7 @@ DEPENDENCIES
paper_trail
piwik_analytics
preserve
puma (~> 3.7)
puma
rack-livereload
rails (>= 5.1.4)
rails-assets-iframe-resizer!
@ -530,7 +531,7 @@ DEPENDENCIES
twitter
tzinfo-data
uglifier
web-console (>= 3.3.0)
web-console
BUNDLED WITH
1.17.3

2
Guardfile

@ -27,7 +27,7 @@ guard :minitest, spring: 'bin/rails test' do
watch(%r{^test/test_helper\.rb}) { 'test' }
end
guard :brakeman, run_on_start: true, quiet: true, min_confidence: 10 do
guard :brakeman, run_on_start: true, quiet: true do
watch(%r{^app/.+\.(erb|haml|rhtml|rb)$})
watch(%r{^config/.+\.rb$})
watch(%r{^lib/.+\.rb$})

2
db/migrate/20170508142601_add_parent_region_to_region.rb

@ -32,7 +32,7 @@ class AddParentRegionToRegion < ActiveRecord::Migration
[
['Namur', :BE],
['Acre', :BR],
['Montréal', 'CA-QC'],
%w[Montréal CA-QC],
['Berne', :CH],
['Bretagne', :FR]
].find do |data|

Loading…
Cancel
Save