Permalink
Browse files

Merge branch 'ignore_gemfiles' of https://github.com/sferik/shoulda i…

…nto sferik-ignore_gemfiles

# By Erik Michaels-Ober
# Via Erik Michaels-Ober
* 'ignore_gemfiles' of https://github.com/sferik/shoulda:
  Sort .gitignore
  Remove and ignore gemfiles

Conflicts:
	gemfiles/3.0.gemfile
	gemfiles/3.0.gemfile.lock
	gemfiles/3.1.gemfile
	gemfiles/3.1.gemfile.lock
	gemfiles/3.2.gemfile
	gemfiles/3.2.gemfile.lock
  • Loading branch information...
2 parents 31b837d + bae5608 commit 203447e142d6eae00ad83f775b7691b189cce19c @rmm5t rmm5t committed May 9, 2013
Showing with 8 additions and 453 deletions.
  1. +8 −7 .gitignore
  2. +0 −7 gemfiles/3.0.gemfile
  3. +0 −127 gemfiles/3.0.gemfile.lock
  4. +0 −9 gemfiles/3.1.gemfile
  5. +0 −148 gemfiles/3.1.gemfile.lock
  6. +0 −9 gemfiles/3.2.gemfile
  7. +0 −146 gemfiles/3.2.gemfile.lock
View
@@ -1,11 +1,12 @@
-test/*/log/*.log
-doc
-coverage
+*.swo
+*.swp
+.bundle
.svn/
+Gemfile.lock
+coverage
+doc
+gemfiles
pkg
-*.swp
-*.swo
tags
+test/*/log/*.log
tmp
-.bundle
-Gemfile.lock
View
@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "3.0.12"
-
-gemspec :path=>"../"
View
@@ -1,127 +0,0 @@
-PATH
- remote: /Users/rmcgeary/work/oss/shoulda
- specs:
- shoulda (3.5.0)
- shoulda-context (~> 1.0, >= 1.0.1)
- shoulda-matchers (>= 1.4.1, < 3.0)
-
-GEM
- remote: https://rubygems.org/
- specs:
- abstract (1.0.0)
- actionmailer (3.0.12)
- actionpack (= 3.0.12)
- mail (~> 2.2.19)
- actionpack (3.0.12)
- activemodel (= 3.0.12)
- activesupport (= 3.0.12)
- builder (~> 2.1.2)
- erubis (~> 2.6.6)
- i18n (~> 0.5.0)
- rack (~> 1.2.5)
- rack-mount (~> 0.6.14)
- rack-test (~> 0.5.7)
- tzinfo (~> 0.3.23)
- activemodel (3.0.12)
- activesupport (= 3.0.12)
- builder (~> 2.1.2)
- i18n (~> 0.5.0)
- activerecord (3.0.12)
- activemodel (= 3.0.12)
- activesupport (= 3.0.12)
- arel (~> 2.0.10)
- tzinfo (~> 0.3.23)
- activeresource (3.0.12)
- activemodel (= 3.0.12)
- activesupport (= 3.0.12)
- activesupport (3.0.12)
- appraisal (0.4.1)
- bundler
- rake
- arel (2.0.10)
- aruba (0.4.11)
- childprocess (>= 0.2.3)
- cucumber (>= 1.1.1)
- ffi (>= 1.0.11)
- rspec (>= 2.7.0)
- builder (2.1.2)
- childprocess (0.3.9)
- ffi (~> 1.0, >= 1.0.11)
- cucumber (1.1.9)
- builder (>= 2.1.2)
- diff-lcs (>= 1.1.2)
- gherkin (~> 2.9.0)
- json (>= 1.4.6)
- term-ansicolor (>= 1.0.6)
- diff-lcs (1.1.3)
- erubis (2.6.6)
- abstract (>= 1.0.0)
- ffi (1.8.1)
- gherkin (2.9.3)
- json (>= 1.4.6)
- i18n (0.5.0)
- json (1.7.7)
- mail (2.2.19)
- activesupport (>= 2.3.6)
- i18n (>= 0.4.0)
- mime-types (~> 1.16)
- treetop (~> 1.4.8)
- mime-types (1.23)
- polyglot (0.3.3)
- rack (1.2.8)
- rack-mount (0.6.14)
- rack (>= 1.0.0)
- rack-test (0.5.7)
- rack (>= 1.0)
- rails (3.0.12)
- actionmailer (= 3.0.12)
- actionpack (= 3.0.12)
- activerecord (= 3.0.12)
- activeresource (= 3.0.12)
- activesupport (= 3.0.12)
- bundler (~> 1.0)
- railties (= 3.0.12)
- railties (3.0.12)
- actionpack (= 3.0.12)
- activesupport (= 3.0.12)
- rake (>= 0.8.7)
- rdoc (~> 3.4)
- thor (~> 0.14.4)
- rake (10.0.4)
- rdoc (3.12.2)
- json (~> 1.4)
- rspec (2.7.0)
- rspec-core (~> 2.7.0)
- rspec-expectations (~> 2.7.0)
- rspec-mocks (~> 2.7.0)
- rspec-core (2.7.1)
- rspec-expectations (2.7.0)
- diff-lcs (~> 1.1.2)
- rspec-mocks (2.7.0)
- rspec-rails (2.7.0)
- actionpack (~> 3.0)
- activesupport (~> 3.0)
- railties (~> 3.0)
- rspec (~> 2.7.0)
- shoulda-context (1.1.1)
- shoulda-matchers (2.1.0)
- activesupport (>= 3.0.0)
- sqlite3 (1.3.7)
- term-ansicolor (1.1.5)
- thor (0.14.6)
- treetop (1.4.12)
- polyglot
- polyglot (>= 0.3.1)
- tzinfo (0.3.37)
-
-PLATFORMS
- ruby
-
-DEPENDENCIES
- appraisal (~> 0.4.0)
- aruba (~> 0.4.11)
- cucumber (~> 1.1.0)
- rails (= 3.0.12)
- rspec-rails (~> 2.7.0)
- shoulda!
- sqlite3 (~> 1.3.2)
View
@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "3.1.4"
-gem "jquery-rails"
-gem "sass-rails"
-
-gemspec :path=>"../"
View
@@ -1,148 +0,0 @@
-PATH
- remote: /Users/rmcgeary/work/oss/shoulda
- specs:
- shoulda (3.5.0)
- shoulda-context (~> 1.0, >= 1.0.1)
- shoulda-matchers (>= 1.4.1, < 3.0)
-
-GEM
- remote: https://rubygems.org/
- specs:
- actionmailer (3.1.4)
- actionpack (= 3.1.4)
- mail (~> 2.3.0)
- actionpack (3.1.4)
- activemodel (= 3.1.4)
- activesupport (= 3.1.4)
- builder (~> 3.0.0)
- erubis (~> 2.7.0)
- i18n (~> 0.6)
- rack (~> 1.3.6)
- rack-cache (~> 1.1)
- rack-mount (~> 0.8.2)
- rack-test (~> 0.6.1)
- sprockets (~> 2.0.3)
- activemodel (3.1.4)
- activesupport (= 3.1.4)
- builder (~> 3.0.0)
- i18n (~> 0.6)
- activerecord (3.1.4)
- activemodel (= 3.1.4)
- activesupport (= 3.1.4)
- arel (~> 2.2.3)
- tzinfo (~> 0.3.29)
- activeresource (3.1.4)
- activemodel (= 3.1.4)
- activesupport (= 3.1.4)
- activesupport (3.1.4)
- multi_json (~> 1.0)
- appraisal (0.4.1)
- bundler
- rake
- arel (2.2.3)
- aruba (0.4.11)
- childprocess (>= 0.2.3)
- cucumber (>= 1.1.1)
- ffi (>= 1.0.11)
- rspec (>= 2.7.0)
- builder (3.0.4)
- childprocess (0.3.9)
- ffi (~> 1.0, >= 1.0.11)
- cucumber (1.1.9)
- builder (>= 2.1.2)
- diff-lcs (>= 1.1.2)
- gherkin (~> 2.9.0)
- json (>= 1.4.6)
- term-ansicolor (>= 1.0.6)
- diff-lcs (1.1.3)
- erubis (2.7.0)
- ffi (1.8.1)
- gherkin (2.9.3)
- json (>= 1.4.6)
- hike (1.2.2)
- i18n (0.6.4)
- jquery-rails (2.2.1)
- railties (>= 3.0, < 5.0)
- thor (>= 0.14, < 2.0)
- json (1.7.7)
- mail (2.3.3)
- i18n (>= 0.4.0)
- mime-types (~> 1.16)
- treetop (~> 1.4.8)
- mime-types (1.23)
- multi_json (1.7.3)
- polyglot (0.3.3)
- rack (1.3.10)
- rack-cache (1.2)
- rack (>= 0.4)
- rack-mount (0.8.3)
- rack (>= 1.0.0)
- rack-ssl (1.3.3)
- rack
- rack-test (0.6.2)
- rack (>= 1.0)
- rails (3.1.4)
- actionmailer (= 3.1.4)
- actionpack (= 3.1.4)
- activerecord (= 3.1.4)
- activeresource (= 3.1.4)
- activesupport (= 3.1.4)
- bundler (~> 1.0)
- railties (= 3.1.4)
- railties (3.1.4)
- actionpack (= 3.1.4)
- activesupport (= 3.1.4)
- rack-ssl (~> 1.3.2)
- rake (>= 0.8.7)
- rdoc (~> 3.4)
- thor (~> 0.14.6)
- rake (10.0.4)
- rdoc (3.12.2)
- json (~> 1.4)
- rspec (2.7.0)
- rspec-core (~> 2.7.0)
- rspec-expectations (~> 2.7.0)
- rspec-mocks (~> 2.7.0)
- rspec-core (2.7.1)
- rspec-expectations (2.7.0)
- diff-lcs (~> 1.1.2)
- rspec-mocks (2.7.0)
- rspec-rails (2.7.0)
- actionpack (~> 3.0)
- activesupport (~> 3.0)
- railties (~> 3.0)
- rspec (~> 2.7.0)
- sass (3.2.8)
- sass-rails (3.1.0)
- actionpack (~> 3.1.0)
- railties (~> 3.1.0)
- sass (>= 3.1.4)
- shoulda-context (1.1.1)
- shoulda-matchers (2.1.0)
- activesupport (>= 3.0.0)
- sprockets (2.0.4)
- hike (~> 1.2)
- rack (~> 1.0)
- tilt (~> 1.1, != 1.3.0)
- sqlite3 (1.3.7)
- term-ansicolor (1.1.5)
- thor (0.14.6)
- tilt (1.4.0)
- treetop (1.4.12)
- polyglot
- polyglot (>= 0.3.1)
- tzinfo (0.3.37)
-
-PLATFORMS
- ruby
-
-DEPENDENCIES
- appraisal (~> 0.4.0)
- aruba (~> 0.4.11)
- cucumber (~> 1.1.0)
- jquery-rails
- rails (= 3.1.4)
- rspec-rails (~> 2.7.0)
- sass-rails
- shoulda!
- sqlite3 (~> 1.3.2)
View
@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "3.2.3"
-gem "jquery-rails"
-gem "sass-rails"
-
-gemspec :path=>"../"
Oops, something went wrong.

0 comments on commit 203447e

Please sign in to comment.