diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-12-28 14:52:43 -0600 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-12-28 14:52:43 -0600 |
| commit | c9d7514fd8d46b0de126fb9d6d081ec25bd3c5bb (patch) | |
| tree | 417386f11b8c9f44bfac861659603281d302f614 /config/boot.rb | |
| parent | 77e1a9b0f8757109ca7f7a4398c46fe8d1d45dbe (diff) | |
| parent | e962baf4417e59cbb2ef8621ef0662f93f180f92 (diff) | |
| download | gitlab-ce-fix-popover-header-size.tar.gz | |
Merge branch 'master' into fix-popover-header-sizefix-popover-header-size
Diffstat (limited to 'config/boot.rb')
| -rw-r--r-- | config/boot.rb | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/config/boot.rb b/config/boot.rb index 725473ac7f6..2811f0e6188 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -1,11 +1,4 @@ -def rails5? - !%w[0 false].include?(ENV["RAILS5"]) -end - -require 'rubygems' unless rails5? - -gemfile = rails5? ? "Gemfile" : "Gemfile.rails4" -ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../#{gemfile}", __dir__) +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) # Set up gems listed in the Gemfile. require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE']) |