Permalink
Browse files

Merge remote-tracking branch 'upstream/master'

Conflicts:
	test-project/Gemfile
  • Loading branch information...
2 parents f28c620 + f4dbce6 commit 07ce857a54a058586e1b2d740658ba980f5efe4d @libc committed Jan 14, 2013
Showing with 16 additions and 8 deletions.
  1. +2 −2 .travis.yml
  2. +10 −0 CHANGES
  3. +2 −2 db-charmer.gemspec
  4. +1 −1 lib/db_charmer/version.rb
  5. +1 −3 test-project/Gemfile
View
@@ -9,8 +9,8 @@ env:
- RAILS_VERSION=3.0.17
- RAILS_VERSION=3.1.8
- RAILS_VERSION=3.2.3
- - RAILS_VERSION=3.2.9
- - RAILS_VERSION=3.2.9 DB_CHARMER_GEM=1.8.0
+ - RAILS_VERSION=3.2.11
+ - RAILS_VERSION=3.2.11 DB_CHARMER_GEM=1.8.2
notifications:
recipients:
View
10 CHANGES
@@ -1,3 +1,13 @@
+1.8.2 (2013-01-11):
+
+Bumped up rails dependencies up to 3.2.11.
+
+----------------------------------------------------------------------------------------
+1.8.1 (2013-01-02):
+
+Bumped up rails dependencies up to 3.2.10.
+
+----------------------------------------------------------------------------------------
1.8.0 (2012-11-12):
Added support for Rails versions up to 3.2.9. Please note, that Rails 3.2.4 is not officially
View
@@ -22,8 +22,8 @@ Gem::Specification.new do |s|
s.extra_rdoc_files = [ 'LICENSE', 'README.rdoc' ]
# Dependencies
- s.add_dependency 'activesupport', '<= 3.2.9'
- s.add_dependency 'activerecord', '<= 3.2.9'
+ s.add_dependency 'activesupport', '<= 3.2.11'
+ s.add_dependency 'activerecord', '<= 3.2.11'
s.add_development_dependency 'rspec'
s.add_development_dependency 'yard'
@@ -2,7 +2,7 @@ module DbCharmer
module Version
MAJOR = 1
MINOR = 8
- PATCH = 0
+ PATCH = 2
BUILD = nil
STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
View
@@ -1,6 +1,7 @@
source 'http://rubygems.org'
gem 'rake', "0.9.2.2"
+gem 'mysql', "2.8.1"
gem 'rspec'
gem 'rspec-rails'
@@ -27,17 +28,14 @@ when /master/
gem "rails", :git => "git://github.com/rails/rails.git"
gem "arel", :git => "git://github.com/rails/arel.git"
gem "journey", :git => "git://github.com/rails/journey.git"
- mysql_version = '~> 2.9'
when /3-0-stable/
gem "rails", :git => "git://github.com/rails/rails.git", :branch => "3-0-stable"
gem "arel", :git => "git://github.com/rails/arel.git", :branch => "2-0-stable"
when /3-1-stable/
gem "rails", :git => "git://github.com/rails/rails.git", :branch => "3-1-stable"
when /3-2-stable/
gem "rails", :git => "git://github.com/rails/rails.git", :branch => "3-2-stable"
- gem "journey", :git => "git://github.com/rails/journey.git"
else
gem "rails", version
end
-gem 'mysql', mysql_version || '~> 2.8.1'

0 comments on commit 07ce857

Please sign in to comment.