Merge branch 'master' of github.com:gitlabhq/gitlabhq

Dmitriy Zaporozhets
2 parents e9cf2e14 4bbb3d55
Showing 5 changed files with 23 additions and 0 deletions Show diff stats
Gemfile
Gemfile.lock
bin/bundle
bin/rails
bin/rake
@@ -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'
@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run
...	...	@@ -208,6 +208,10 @@ group :development, :test do
208	208
209	209	gem 'spork', '~> 1.0rc'
210	210	gem 'jasmine', '2.0.0.rc5'
	211	+
	212	+ gem "spring", '1.1.1'
	213	+ gem "spring-commands-rspec", '1.0.1'
	214	+ gem "spring-commands-spinach", '1.0.0'
211	215	end
212	216
213	217	group :test do
...	...
...	...	@@ -470,6 +470,11 @@ GEM
470	470	railties (>= 3)
471	471	spinach (>= 0.4)
472	472	spork (1.0.0rc4)
	473	+ spring (1.1.1)
	474	+ spring-commands-rspec (1.0.1)
	475	+ spring (>= 0.9.1)
	476	+ spring-commands-spinach (1.0.0)
	477	+ spring (>= 0.9.1)
473	478	sprockets (2.10.1)
474	479	hike (~> 1.2)
475	480	multi_json (~> 1.0)
...	...	@@ -637,6 +642,9 @@ DEPENDENCIES
637	642	slim
638	643	spinach-rails
639	644	spork (~> 1.0rc)
	645	+ spring (= 1.1.1)
	646	+ spring-commands-rspec (= 1.0.1)
	647	+ spring-commands-spinach (= 1.0.0)
640	648	stamp
641	649	state_machine
642	650	test_after_commit
...	...
...	...	@@ -0,0 +1,3 @@
	1	+#!/usr/bin/env ruby
	2	+ENV['BUNDLE_GEMFILE'] \|\|= File.expand_path('../../Gemfile', __FILE__)
	3	+load Gem.bin_path('bundler', 'bundle')
...	...
...	...	@@ -0,0 +1,4 @@
	1	+#!/usr/bin/env ruby
	2	+APP_PATH = File.expand_path('../../config/application', __FILE__)
	3	+require_relative '../config/boot'
	4	+require 'rails/commands'
...	...