diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-05-17 22:17:20 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-05-17 22:17:20 +0000 |
| commit | d3adee5105d4c7745b03ad23999d20fd42b3c575 (patch) | |
| tree | b1a67f0dfec96ab4ada3e5363317ce408269e46b /bin/spinach | |
| parent | f214efb87bd345490277b9962b43752c095c0b2c (diff) | |
| parent | d6c8a55189d62430c7ca4ffa6e5bb63f15a7efc1 (diff) | |
| download | gitlab-ce-sh-move-delete-groups-api-async.tar.gz | |
Merge branch 'master' into 'sh-move-delete-groups-api-async'sh-move-delete-groups-api-async
# Conflicts:
# lib/api/v3/groups.rb
Diffstat (limited to 'bin/spinach')
| -rwxr-xr-x | bin/spinach | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/bin/spinach b/bin/spinach deleted file mode 100755 index eda81c9ed8a..00000000000 --- a/bin/spinach +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env ruby - -# Remove this block when removing rails5? code. -gemfile = %w[1 true].include?(ENV["RAILS5"]) ? "Gemfile.rails5" : "Gemfile" -ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../#{gemfile}", __dir__) - -begin - load File.expand_path('../spring', __FILE__) -rescue LoadError => e - raise unless e.message.include?('spring') -end -require 'bundler/setup' -load Gem.bin_path('spinach', 'spinach') |