diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2016-03-12 16:09:46 +0100 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-03-12 16:21:53 +0100 |
commit | aab9f57e369c492bad03bcf15411394897314b4d (patch) | |
tree | ae8cf704e2b2321993cabf326af82ae0f86b6697 /bin | |
parent | 447cfef62d74a670ddd600c0240f41746ac2fe0a (diff) |
Adding config for puma, dashboard layout, fixing some queries
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/rails | 5 | ||||
-rwxr-xr-x | bin/rake | 5 | ||||
-rwxr-xr-x | bin/spring | 15 |
3 files changed, 0 insertions, 25 deletions
diff --git a/bin/rails b/bin/rails index 0138d79b7..5191e6927 100755 --- a/bin/rails +++ b/bin/rails @@ -1,9 +1,4 @@ #!/usr/bin/env ruby -begin - load File.expand_path('../spring', __FILE__) -rescue LoadError => e - raise unless e.message.include?('spring') -end APP_PATH = File.expand_path('../../config/application', __FILE__) require_relative '../config/boot' require 'rails/commands' diff --git a/bin/rake b/bin/rake index d87d5f578..17240489f 100755 --- a/bin/rake +++ b/bin/rake @@ -1,9 +1,4 @@ #!/usr/bin/env ruby -begin - load File.expand_path('../spring', __FILE__) -rescue LoadError => e - raise unless e.message.include?('spring') -end require_relative '../config/boot' require 'rake' Rake.application.run diff --git a/bin/spring b/bin/spring deleted file mode 100755 index 62ec28f8c..000000000 --- a/bin/spring +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env ruby - -# This file loads spring without using Bundler, in order to be fast. -# It gets overwritten when you run the `spring binstub` command. - -unless defined?(Spring) - require 'rubygems' - require 'bundler' - - if (match = Bundler.default_lockfile.read.match(/^GEM$.*?^ (?: )*spring \((.*?)\)$.*?^$/m)) - Gem.paths = { 'GEM_PATH' => [Bundler.bundle_path.to_s, *Gem.path].uniq } - gem 'spring', match[1] - require 'spring/binstub' - end -end |