Commit 44bc5533 authored by Jonne Haß's avatar Jonne Haß Committed by Dennis Schubert
Browse files

bump spring

parent 75c8d0c4

Gemfile

+1 −1
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ group :development do 


  # Preloading environment



  gem "spring", "1.4.0"

  gem "spring", "1.5.0"

  gem "spring-commands-rspec", "1.0.4"

  gem "spring-commands-cucumber", "1.0.1"

Gemfile.lock

+2 −2
Original line number Diff line number Diff line
@@ -701,7 +701,7 @@ GEM 
    sinon-rails (1.15.0)

      railties (>= 3.1)

    slop (3.6.0)

    spring (1.4.0)

    spring (1.5.0)

    spring-commands-cucumber (1.0.1)

      spring (>= 0.9.1)

    spring-commands-rspec (1.0.4)
@@ -887,7 +887,7 @@ DEPENDENCIES 
  simplecov (= 0.11.1)

  sinatra (= 1.4.6)

  sinon-rails (= 1.15.0)

  spring (= 1.4.0)

  spring (= 1.5.0)

  spring-commands-cucumber (= 1.0.1)

  spring-commands-rspec (= 1.0.4)

  test_after_commit (= 0.4.1)

bin/cucumber

+3 −2
Original line number Diff line number Diff line 
#!/usr/bin/env ruby

begin

  load File.expand_path("../spring", __FILE__)

rescue LoadError

  load File.expand_path('../spring', __FILE__)

rescue LoadError => e

  raise unless e.message.include?('spring')

end

require 'bundler/setup'

load Gem.bin_path('cucumber', 'cucumber')

bin/rails

+6 −3
Original line number Diff line number Diff line 
#!/usr/bin/env ruby

begin

  load File.expand_path("../spring", __FILE__)

rescue LoadError

  load File.expand_path('../spring', __FILE__)

rescue LoadError => e

  raise unless e.message.include?('spring')

end

# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.



APP_PATH = File.expand_path('../../config/application',  __FILE__)

require_relative '../config/boot'

require File.expand_path('../../config/boot',  __FILE__)

require 'rails/commands'

bin/rake

+3 −2
Original line number Diff line number Diff line 
#!/usr/bin/env ruby

begin

  load File.expand_path("../spring", __FILE__)

rescue LoadError

  load File.expand_path('../spring', __FILE__)

rescue LoadError => e

  raise unless e.message.include?('spring')

end

require_relative '../config/boot'

require 'rake'