Skip to content

Commit

Permalink
Merge pull request #45 from pitr/rails-41
Browse files Browse the repository at this point in the history
Rails 4.1
  • Loading branch information
orslumen committed Oct 12, 2015
2 parents 6e03f7b + c2c053a commit 57a8ac7
Show file tree
Hide file tree
Showing 12 changed files with 593 additions and 8 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,6 @@ matrix:

gemfile:
- gemfiles/rails_40.gemfile
- gemfiles/rails_41.gemfile

script: 'bundle exec rake'
4 changes: 4 additions & 0 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,7 @@ end
appraise 'rails-40' do
gem 'rails', '4.0.13'
end

appraise 'rails-41' do
gem 'rails', '4.1.13'
end
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ PLATFORMS
ruby

DEPENDENCIES
activerecord (< 4.1)
activerecord (< 4.2)
appraisal
bundler
database_cleaner
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_30.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ PLATFORMS
ruby

DEPENDENCIES
activerecord (< 4.1)
activerecord (< 4.2)
appraisal
bundler
database_cleaner
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_31.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ PLATFORMS
ruby

DEPENDENCIES
activerecord (< 4.1)
activerecord (< 4.2)
appraisal
bundler
database_cleaner
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_32.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ PLATFORMS
ruby

DEPENDENCIES
activerecord (< 4.1)
activerecord (< 4.2)
appraisal
bundler
database_cleaner
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_40.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ PLATFORMS
ruby

DEPENDENCIES
activerecord (< 4.1)
activerecord (< 4.2)
appraisal
bundler
database_cleaner
Expand Down
7 changes: 7 additions & 0 deletions gemfiles/rails_41.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "rails", "4.1.13"

gemspec :path => "../"
127 changes: 127 additions & 0 deletions gemfiles/rails_41.gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
PATH
remote: ../
specs:
record-cache (0.1.3)
rails

GEM
remote: https://rubygems.org/
specs:
actionmailer (4.1.13)
actionpack (= 4.1.13)
actionview (= 4.1.13)
mail (~> 2.5, >= 2.5.4)
actionpack (4.1.13)
actionview (= 4.1.13)
activesupport (= 4.1.13)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
actionview (4.1.13)
activesupport (= 4.1.13)
builder (~> 3.1)
erubis (~> 2.7.0)
activemodel (4.1.13)
activesupport (= 4.1.13)
builder (~> 3.1)
activerecord (4.1.13)
activemodel (= 4.1.13)
activesupport (= 4.1.13)
arel (~> 5.0.0)
activesupport (4.1.13)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 1.1)
appraisal (2.1.0)
bundler
rake
thor (>= 0.14.0)
arel (5.0.1.20140414130214)
builder (3.2.2)
coderay (1.1.0)
database_cleaner (1.5.0)
diff-lcs (1.2.5)
docile (1.1.5)
erubis (2.7.0)
i18n (0.7.0)
json (1.8.3)
mail (2.6.3)
mime-types (>= 1.16, < 3)
method_source (0.8.2)
mime-types (2.6.2)
minitest (5.8.1)
mysql2 (0.4.1)
pry (0.10.2)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
rack (1.5.5)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.1.13)
actionmailer (= 4.1.13)
actionpack (= 4.1.13)
actionview (= 4.1.13)
activemodel (= 4.1.13)
activerecord (= 4.1.13)
activesupport (= 4.1.13)
bundler (>= 1.3.0, < 2.0)
railties (= 4.1.13)
sprockets-rails (~> 2.0)
railties (4.1.13)
actionpack (= 4.1.13)
activesupport (= 4.1.13)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.4.2)
rspec (3.3.0)
rspec-core (~> 3.3.0)
rspec-expectations (~> 3.3.0)
rspec-mocks (~> 3.3.0)
rspec-core (3.3.2)
rspec-support (~> 3.3.0)
rspec-expectations (3.3.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.3.0)
rspec-mocks (3.3.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.3.0)
rspec-support (3.3.0)
simplecov (0.10.0)
docile (~> 1.1.0)
json (~> 1.8)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
slop (3.6.0)
sprockets (3.4.0)
rack (> 1, < 3)
sprockets-rails (2.3.3)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
sqlite3 (1.3.10)
test_after_commit (0.4.1)
activerecord (>= 3.2)
thor (0.19.1)
thread_safe (0.3.5)
tzinfo (1.2.2)
thread_safe (~> 0.1)

PLATFORMS
ruby

DEPENDENCIES
activerecord (< 4.2)
appraisal
bundler
database_cleaner
mysql2
pry
rails (= 4.1.13)
rake
record-cache!
rspec (~> 3.0)
simplecov
sqlite3
test_after_commit
Loading

0 comments on commit 57a8ac7

Please sign in to comment.