forked from cybrespace/mastodon
		
	Bump rails from 5.1.3 to 5.1.4 (#4875)
Bumps [rails](https://github.com/rails/rails) from 5.1.3 to 5.1.4. - [Commits](https://github.com/rails/rails/compare/v5.1.3...v5.1.4)
This commit is contained in:
		
							parent
							
								
									47d48fed8d
								
							
						
					
					
						commit
						bbff144004
					
				
					 2 changed files with 38 additions and 38 deletions
				
			
		
							
								
								
									
										2
									
								
								Gemfile
									
										
									
									
									
								
							
							
						
						
									
										2
									
								
								Gemfile
									
										
									
									
									
								
							| 
						 | 
					@ -6,7 +6,7 @@ ruby '>= 2.3.0', '< 2.5.0'
 | 
				
			||||||
gem 'pkg-config', '~> 1.2'
 | 
					gem 'pkg-config', '~> 1.2'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
gem 'puma', '~> 3.8'
 | 
					gem 'puma', '~> 3.8'
 | 
				
			||||||
gem 'rails', '~> 5.1.0'
 | 
					gem 'rails', '~> 5.1.4'
 | 
				
			||||||
gem 'uglifier', '~> 3.2'
 | 
					gem 'uglifier', '~> 3.2'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
gem 'hamlit-rails', '~> 0.2'
 | 
					gem 'hamlit-rails', '~> 0.2'
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										74
									
								
								Gemfile.lock
									
										
									
									
									
								
							
							
						
						
									
										74
									
								
								Gemfile.lock
									
										
									
									
									
								
							| 
						 | 
					@ -1,25 +1,25 @@
 | 
				
			||||||
GEM
 | 
					GEM
 | 
				
			||||||
  remote: https://rubygems.org/
 | 
					  remote: https://rubygems.org/
 | 
				
			||||||
  specs:
 | 
					  specs:
 | 
				
			||||||
    actioncable (5.1.3)
 | 
					    actioncable (5.1.4)
 | 
				
			||||||
      actionpack (= 5.1.3)
 | 
					      actionpack (= 5.1.4)
 | 
				
			||||||
      nio4r (~> 2.0)
 | 
					      nio4r (~> 2.0)
 | 
				
			||||||
      websocket-driver (~> 0.6.1)
 | 
					      websocket-driver (~> 0.6.1)
 | 
				
			||||||
    actionmailer (5.1.3)
 | 
					    actionmailer (5.1.4)
 | 
				
			||||||
      actionpack (= 5.1.3)
 | 
					      actionpack (= 5.1.4)
 | 
				
			||||||
      actionview (= 5.1.3)
 | 
					      actionview (= 5.1.4)
 | 
				
			||||||
      activejob (= 5.1.3)
 | 
					      activejob (= 5.1.4)
 | 
				
			||||||
      mail (~> 2.5, >= 2.5.4)
 | 
					      mail (~> 2.5, >= 2.5.4)
 | 
				
			||||||
      rails-dom-testing (~> 2.0)
 | 
					      rails-dom-testing (~> 2.0)
 | 
				
			||||||
    actionpack (5.1.3)
 | 
					    actionpack (5.1.4)
 | 
				
			||||||
      actionview (= 5.1.3)
 | 
					      actionview (= 5.1.4)
 | 
				
			||||||
      activesupport (= 5.1.3)
 | 
					      activesupport (= 5.1.4)
 | 
				
			||||||
      rack (~> 2.0)
 | 
					      rack (~> 2.0)
 | 
				
			||||||
      rack-test (~> 0.6.3)
 | 
					      rack-test (>= 0.6.3)
 | 
				
			||||||
      rails-dom-testing (~> 2.0)
 | 
					      rails-dom-testing (~> 2.0)
 | 
				
			||||||
      rails-html-sanitizer (~> 1.0, >= 1.0.2)
 | 
					      rails-html-sanitizer (~> 1.0, >= 1.0.2)
 | 
				
			||||||
    actionview (5.1.3)
 | 
					    actionview (5.1.4)
 | 
				
			||||||
      activesupport (= 5.1.3)
 | 
					      activesupport (= 5.1.4)
 | 
				
			||||||
      builder (~> 3.1)
 | 
					      builder (~> 3.1)
 | 
				
			||||||
      erubi (~> 1.4)
 | 
					      erubi (~> 1.4)
 | 
				
			||||||
      rails-dom-testing (~> 2.0)
 | 
					      rails-dom-testing (~> 2.0)
 | 
				
			||||||
| 
						 | 
					@ -30,16 +30,16 @@ GEM
 | 
				
			||||||
      case_transform (>= 0.2)
 | 
					      case_transform (>= 0.2)
 | 
				
			||||||
      jsonapi-renderer (>= 0.1.1.beta1, < 0.2)
 | 
					      jsonapi-renderer (>= 0.1.1.beta1, < 0.2)
 | 
				
			||||||
    active_record_query_trace (1.5.4)
 | 
					    active_record_query_trace (1.5.4)
 | 
				
			||||||
    activejob (5.1.3)
 | 
					    activejob (5.1.4)
 | 
				
			||||||
      activesupport (= 5.1.3)
 | 
					      activesupport (= 5.1.4)
 | 
				
			||||||
      globalid (>= 0.3.6)
 | 
					      globalid (>= 0.3.6)
 | 
				
			||||||
    activemodel (5.1.3)
 | 
					    activemodel (5.1.4)
 | 
				
			||||||
      activesupport (= 5.1.3)
 | 
					      activesupport (= 5.1.4)
 | 
				
			||||||
    activerecord (5.1.3)
 | 
					    activerecord (5.1.4)
 | 
				
			||||||
      activemodel (= 5.1.3)
 | 
					      activemodel (= 5.1.4)
 | 
				
			||||||
      activesupport (= 5.1.3)
 | 
					      activesupport (= 5.1.4)
 | 
				
			||||||
      arel (~> 8.0)
 | 
					      arel (~> 8.0)
 | 
				
			||||||
    activesupport (5.1.3)
 | 
					    activesupport (5.1.4)
 | 
				
			||||||
      concurrent-ruby (~> 1.0, >= 1.0.2)
 | 
					      concurrent-ruby (~> 1.0, >= 1.0.2)
 | 
				
			||||||
      i18n (~> 0.7)
 | 
					      i18n (~> 0.7)
 | 
				
			||||||
      minitest (~> 5.1)
 | 
					      minitest (~> 5.1)
 | 
				
			||||||
| 
						 | 
					@ -334,20 +334,20 @@ GEM
 | 
				
			||||||
    rack-cors (0.4.1)
 | 
					    rack-cors (0.4.1)
 | 
				
			||||||
    rack-protection (2.0.0)
 | 
					    rack-protection (2.0.0)
 | 
				
			||||||
      rack
 | 
					      rack
 | 
				
			||||||
    rack-test (0.6.3)
 | 
					    rack-test (0.7.0)
 | 
				
			||||||
      rack (>= 1.0)
 | 
					      rack (>= 1.0, < 3)
 | 
				
			||||||
    rack-timeout (0.4.2)
 | 
					    rack-timeout (0.4.2)
 | 
				
			||||||
    rails (5.1.3)
 | 
					    rails (5.1.4)
 | 
				
			||||||
      actioncable (= 5.1.3)
 | 
					      actioncable (= 5.1.4)
 | 
				
			||||||
      actionmailer (= 5.1.3)
 | 
					      actionmailer (= 5.1.4)
 | 
				
			||||||
      actionpack (= 5.1.3)
 | 
					      actionpack (= 5.1.4)
 | 
				
			||||||
      actionview (= 5.1.3)
 | 
					      actionview (= 5.1.4)
 | 
				
			||||||
      activejob (= 5.1.3)
 | 
					      activejob (= 5.1.4)
 | 
				
			||||||
      activemodel (= 5.1.3)
 | 
					      activemodel (= 5.1.4)
 | 
				
			||||||
      activerecord (= 5.1.3)
 | 
					      activerecord (= 5.1.4)
 | 
				
			||||||
      activesupport (= 5.1.3)
 | 
					      activesupport (= 5.1.4)
 | 
				
			||||||
      bundler (>= 1.3.0)
 | 
					      bundler (>= 1.3.0)
 | 
				
			||||||
      railties (= 5.1.3)
 | 
					      railties (= 5.1.4)
 | 
				
			||||||
      sprockets-rails (>= 2.0.0)
 | 
					      sprockets-rails (>= 2.0.0)
 | 
				
			||||||
    rails-controller-testing (1.0.2)
 | 
					    rails-controller-testing (1.0.2)
 | 
				
			||||||
      actionpack (~> 5.x, >= 5.0.1)
 | 
					      actionpack (~> 5.x, >= 5.0.1)
 | 
				
			||||||
| 
						 | 
					@ -363,9 +363,9 @@ GEM
 | 
				
			||||||
      railties (~> 5.0)
 | 
					      railties (~> 5.0)
 | 
				
			||||||
    rails-settings-cached (0.6.6)
 | 
					    rails-settings-cached (0.6.6)
 | 
				
			||||||
      rails (>= 4.2.0)
 | 
					      rails (>= 4.2.0)
 | 
				
			||||||
    railties (5.1.3)
 | 
					    railties (5.1.4)
 | 
				
			||||||
      actionpack (= 5.1.3)
 | 
					      actionpack (= 5.1.4)
 | 
				
			||||||
      activesupport (= 5.1.3)
 | 
					      activesupport (= 5.1.4)
 | 
				
			||||||
      method_source
 | 
					      method_source
 | 
				
			||||||
      rake (>= 0.8.7)
 | 
					      rake (>= 0.8.7)
 | 
				
			||||||
      thor (>= 0.18.1, < 2.0)
 | 
					      thor (>= 0.18.1, < 2.0)
 | 
				
			||||||
| 
						 | 
					@ -472,7 +472,7 @@ GEM
 | 
				
			||||||
    sprockets (3.7.1)
 | 
					    sprockets (3.7.1)
 | 
				
			||||||
      concurrent-ruby (~> 1.0)
 | 
					      concurrent-ruby (~> 1.0)
 | 
				
			||||||
      rack (> 1, < 3)
 | 
					      rack (> 1, < 3)
 | 
				
			||||||
    sprockets-rails (3.2.0)
 | 
					    sprockets-rails (3.2.1)
 | 
				
			||||||
      actionpack (>= 4.0)
 | 
					      actionpack (>= 4.0)
 | 
				
			||||||
      activesupport (>= 4.0)
 | 
					      activesupport (>= 4.0)
 | 
				
			||||||
      sprockets (>= 3.0.0)
 | 
					      sprockets (>= 3.0.0)
 | 
				
			||||||
| 
						 | 
					@ -588,7 +588,7 @@ DEPENDENCIES
 | 
				
			||||||
  rack-attack (~> 5.0)
 | 
					  rack-attack (~> 5.0)
 | 
				
			||||||
  rack-cors (~> 0.4)
 | 
					  rack-cors (~> 0.4)
 | 
				
			||||||
  rack-timeout (~> 0.4)
 | 
					  rack-timeout (~> 0.4)
 | 
				
			||||||
  rails (~> 5.1.0)
 | 
					  rails (~> 5.1.4)
 | 
				
			||||||
  rails-controller-testing (~> 1.0)
 | 
					  rails-controller-testing (~> 1.0)
 | 
				
			||||||
  rails-i18n (~> 5.0)
 | 
					  rails-i18n (~> 5.0)
 | 
				
			||||||
  rails-settings-cached (~> 0.6)
 | 
					  rails-settings-cached (~> 0.6)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		
		Reference in a new issue