diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-16 19:51:39 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-16 19:51:39 +0200 |
| commit | 8136048875004a21632e98eaa6d675a529caa831 (patch) | |
| tree | 1959624fbd1009366f2ec5c60f6cc5c4fd5cc373 | |
| parent | e9cf2e140f9685e43a63ed6095874f8096de90c3 (diff) | |
| parent | 4bbb3d5510d5396eca034a9a8593952b16b15ab5 (diff) | |
| download | gitlab-ce-8136048875004a21632e98eaa6d675a529caa831.tar.gz | |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 8 | ||||
| -rw-r--r-- | bin/bundle | 3 | ||||
| -rw-r--r-- | bin/rails | 4 | ||||
| -rw-r--r-- | bin/rake | 4 |
5 files changed, 23 insertions, 0 deletions
@@ -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 diff --git a/Gemfile.lock b/Gemfile.lock index 2c99063726e..91d04e2ec70 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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 diff --git a/bin/bundle b/bin/bundle new file mode 100644 index 00000000000..66e9889e8b4 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,3 @@ +#!/usr/bin/env ruby +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) +load Gem.bin_path('bundler', 'bundle') diff --git a/bin/rails b/bin/rails new file mode 100644 index 00000000000..728cd85aa58 --- /dev/null +++ b/bin/rails @@ -0,0 +1,4 @@ +#!/usr/bin/env ruby +APP_PATH = File.expand_path('../../config/application', __FILE__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100644 index 00000000000..17240489f64 --- /dev/null +++ b/bin/rake @@ -0,0 +1,4 @@ +#!/usr/bin/env ruby +require_relative '../config/boot' +require 'rake' +Rake.application.run |