Merge branch 'master' of github.com:gitlabhq/gitlabhq
This commit is contained in:
commit
8136048875
4
Gemfile
4
Gemfile
|
@ -208,6 +208,10 @@ group :development, :test do
|
|||
|
||||
gem 'spork', '~> 1.0rc'
|
||||
gem 'jasmine', '2.0.0.rc5'
|
||||
|
||||
gem "spring", '1.1.1'
|
||||
gem "spring-commands-rspec", '1.0.1'
|
||||
gem "spring-commands-spinach", '1.0.0'
|
||||
end
|
||||
|
||||
group :test do
|
||||
|
|
|
@ -470,6 +470,11 @@ GEM
|
|||
railties (>= 3)
|
||||
spinach (>= 0.4)
|
||||
spork (1.0.0rc4)
|
||||
spring (1.1.1)
|
||||
spring-commands-rspec (1.0.1)
|
||||
spring (>= 0.9.1)
|
||||
spring-commands-spinach (1.0.0)
|
||||
spring (>= 0.9.1)
|
||||
sprockets (2.10.1)
|
||||
hike (~> 1.2)
|
||||
multi_json (~> 1.0)
|
||||
|
@ -637,6 +642,9 @@ DEPENDENCIES
|
|||
slim
|
||||
spinach-rails
|
||||
spork (~> 1.0rc)
|
||||
spring (= 1.1.1)
|
||||
spring-commands-rspec (= 1.0.1)
|
||||
spring-commands-spinach (= 1.0.0)
|
||||
stamp
|
||||
state_machine
|
||||
test_after_commit
|
||||
|
|
|
@ -0,0 +1,3 @@
|
|||
#!/usr/bin/env ruby
|
||||
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
|
||||
load Gem.bin_path('bundler', 'bundle')
|
|
@ -0,0 +1,4 @@
|
|||
#!/usr/bin/env ruby
|
||||
APP_PATH = File.expand_path('../../config/application', __FILE__)
|
||||
require_relative '../config/boot'
|
||||
require 'rails/commands'
|
Loading…
Reference in New Issue