Download as
Browse Code »

Commit c7d0e0f5fe190c7321061f0abd836bfb8a46e9cc

Authored by Edgars Beigarts
1 parent ec23f7a7
Exists in master

Check ruby version later when booting to avoid issues with dokku 

https://github.com/dokku/dokku/issues/1899
Showing 2 changed files with 10 additions and 8 deletions   Show diff stats
@@ -4,14 +4,6 @@ RAILS_VERSION = '~> 4.2.5.1' @@ -4,14 +4,6 @@ RAILS_VERSION = '~> 4.2.5.1'
4 4
5 send :ruby, ENV['GEMFILE_RUBY_VERSION'] if ENV['GEMFILE_RUBY_VERSION'] 5 send :ruby, ENV['GEMFILE_RUBY_VERSION'] if ENV['GEMFILE_RUBY_VERSION']
6 6
7 -detected_ruby_version = Gem::Version.new(RUBY_VERSION.dup)  
8 -required_ruby_version = Gem::Version.new('2.1.0') # minimum supported version  
9 -  
10 -if detected_ruby_version < required_ruby_version  
11 - fail "RUBY_VERSION must be at least #{required_ruby_version}, " \  
12 - "detected RUBY_VERSION #{RUBY_VERSION}"  
13 -end  
14 -  
15 gem 'actionmailer', RAILS_VERSION 7 gem 'actionmailer', RAILS_VERSION
16 gem 'actionpack', RAILS_VERSION 8 gem 'actionpack', RAILS_VERSION
17 gem 'railties', RAILS_VERSION 9 gem 'railties', RAILS_VERSION
config/boot.rb
  Diff comments   View file @c7d0e0f
  1 +require 'rubygems'
  2 +
  3 +detected_ruby_version = Gem::Version.new(RUBY_VERSION.dup)
  4 +required_ruby_version = Gem::Version.new('2.1.0') # minimum supported version
  5 +
  6 +if detected_ruby_version < required_ruby_version
  7 + fail "RUBY_VERSION must be at least #{required_ruby_version}, " \
  8 + "detected RUBY_VERSION #{RUBY_VERSION}"
  9 +end
  10 +
1 # Set up gems listed in the Gemfile. 11 # Set up gems listed in the Gemfile.
2 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) 12 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
3 13