Download as
Browse Code »

Commit 9680c64fa880fa5df28db0171552f21513152620

Authored by gitlabhq
1 parent 162c4b04
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

gem forks

Showing 2 changed files with 13 additions and 13 deletions   Show diff stats
@@ -8,14 +8,14 @@ gem 'stamp' @@ -8,14 +8,14 @@ gem 'stamp'
8 gem 'will_paginate', '~> 3.0' 8 gem 'will_paginate', '~> 3.0'
9 gem 'haml-rails' 9 gem 'haml-rails'
10 gem 'jquery-rails' 10 gem 'jquery-rails'
11 -gem 'grit', :git => 'git://github.com/mojombo/grit.git' 11 +gem 'grit', :git => 'git://github.com/gitlabhq/grit.git'
12 gem "carrierwave" 12 gem "carrierwave"
13 gem 'six' 13 gem 'six'
14 gem 'therubyracer' 14 gem 'therubyracer'
15 gem 'faker' 15 gem 'faker'
16 gem 'seed-fu', :branch => 'rails-3-1', :git => 'git://github.com/mbleigh/seed-fu.git' 16 gem 'seed-fu', :branch => 'rails-3-1', :git => 'git://github.com/mbleigh/seed-fu.git'
17 gem "inifile" 17 gem "inifile"
18 -gem "albino", :git => "git://github.com/randx/albino.git" 18 +gem "albino", :git => "git://github.com/gitlabhq/albino.git"
19 gem "kaminari" 19 gem "kaminari"
20 gem "thin" 20 gem "thin"
21 gem "git" 21 gem "git"
@@ -5,16 +5,14 @@ GIT @@ -5,16 +5,14 @@ GIT
5 annotate (2.4.1.beta1) 5 annotate (2.4.1.beta1)
6 6
7 GIT 7 GIT
8 - remote: git://github.com/mbleigh/seed-fu.git  
9 - revision: 29fe8c61ca6cc4408115ea7475fe2647081bd348  
10 - branch: rails-3-1 8 + remote: git://github.com/gitlabhq/albino.git
  9 + revision: 118380924969f3a856659f86ea1f40c1ba7bfcb1
11 specs: 10 specs:
12 - seed-fu (2.0.1.rails31)  
13 - activerecord (~> 3.1.0.rc4)  
14 - activesupport (~> 3.1.0.rc4) 11 + albino (1.3.3)
  12 + posix-spawn (>= 0.3.6)
15 13
16 GIT 14 GIT
17 - remote: git://github.com/mojombo/grit.git 15 + remote: git://github.com/gitlabhq/grit.git
18 revision: ff015074ef35bd94cba943f9c0f98e161ab5851c 16 revision: ff015074ef35bd94cba943f9c0f98e161ab5851c
19 specs: 17 specs:
20 grit (2.4.1) 18 grit (2.4.1)
@@ -23,11 +21,13 @@ GIT @@ -23,11 +21,13 @@ GIT
23 posix-spawn (~> 0.3.6) 21 posix-spawn (~> 0.3.6)
24 22
25 GIT 23 GIT
26 - remote: git://github.com/randx/albino.git  
27 - revision: 118380924969f3a856659f86ea1f40c1ba7bfcb1 24 + remote: git://github.com/mbleigh/seed-fu.git
  25 + revision: 29fe8c61ca6cc4408115ea7475fe2647081bd348
  26 + branch: rails-3-1
28 specs: 27 specs:
29 - albino (1.3.3)  
30 - posix-spawn (>= 0.3.6) 28 + seed-fu (2.0.1.rails31)
  29 + activerecord (~> 3.1.0.rc4)
  30 + activesupport (~> 3.1.0.rc4)
31 31
32 GEM 32 GEM
33 remote: http://rubygems.org/ 33 remote: http://rubygems.org/