Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: rails/rails
...
head fork: rails/rails
  • 4 commits
  • 13 files changed
  • 0 commit comments
  • 2 contributors
Commits on Oct 23, 2013
@rafaelfranca rafaelfranca Fix the install task b7a495a
@rafaelfranca rafaelfranca Merge pull request #12619 from Veraticus/fix_utils_normalize_path
Correct error in Utils.normalize_path that changed paths improperly
dece340
Commits on Oct 30, 2013
@senny senny fix code typo in `MysqlAdapter` .Closes #12647.
Conflicts:
	activerecord/CHANGELOG.md
5d7e865
@rafaelfranca rafaelfranca Release 4.0.1.rc4 9466dad
View
2  RAILS_VERSION
@@ -1 +1 @@
-4.0.1.rc3
+4.0.1.rc4
View
10 Rakefile
@@ -36,15 +36,7 @@ task :smoke do
end
desc "Install gems for all projects."
-task :install => :build do
- version = File.read("RAILS_VERSION").strip
- (PROJECTS - ["railties"]).each do |project|
- puts "INSTALLING #{project}"
- system("gem install #{project}/pkg/#{project}-#{version}.gem --local --no-ri --no-rdoc")
- end
- system("gem install railties/pkg/railties-#{version}.gem --local --no-ri --no-rdoc")
- system("gem install pkg/rails-#{version}.gem --local --no-ri --no-rdoc")
-end
+task :install => "all:install"
desc "Generate documentation for the Rails framework"
if ENV['EDGE']
View
2  actionmailer/lib/action_mailer/version.rb
@@ -1,7 +1,7 @@
module ActionMailer
# Returns the version of the currently loaded ActionMailer as a Gem::Version
def self.version
- Gem::Version.new "4.0.1.rc3"
+ Gem::Version.new "4.0.1.rc4"
end
module VERSION #:nodoc:
View
2  actionpack/lib/action_dispatch/journey/router/utils.rb
@@ -18,7 +18,7 @@ def self.normalize_path(path)
path = "/#{path}"
path.squeeze!('/')
path.sub!(%r{/+\Z}, '')
- path.gsub!(/(%[a-f0-9]{2}+)/) { $1.upcase }
+ path.gsub!(/(%[a-f0-9]{2})/) { $1.upcase }
path = '/' if path == ''
path
end
View
2  actionpack/lib/action_pack/version.rb
@@ -1,7 +1,7 @@
module ActionPack
# Returns the version of the currently loaded ActionPack as a Gem::Version
def self.version
- Gem::Version.new "4.0.1.rc3"
+ Gem::Version.new "4.0.1.rc4"
end
module VERSION #:nodoc:
View
8 actionpack/test/journey/router/utils_test.rb
@@ -15,6 +15,14 @@ def test_fragment_escape
def test_uri_unescape
assert_equal "a/b c+d", Utils.unescape_uri("a%2Fb%20c+d")
end
+
+ def test_normalize_path_not_greedy
+ assert_equal "/foo%20bar%20baz", Utils.normalize_path("/foo%20bar%20baz")
+ end
+
+ def test_normalize_path_uppercase
+ assert_equal "/foo%AAbar%AAbaz", Utils.normalize_path("/foo%aabar%aabaz")
+ end
end
end
end
View
2  activemodel/lib/active_model/version.rb
@@ -1,7 +1,7 @@
module ActiveModel
# Returns the version of the currently loaded ActiveModel as a Gem::Version
def self.version
- Gem::Version.new "4.0.1.rc3"
+ Gem::Version.new "4.0.1.rc4"
end
module VERSION #:nodoc:
View
2  activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -559,7 +559,7 @@ def version
def set_field_encoding field_name
field_name.force_encoding(client_encoding)
if internal_enc = Encoding.default_internal
- field_name = field_name.encoding(internal_enc)
+ field_name = field_name.encode!(internal_enc)
end
field_name
end
View
2  activerecord/lib/active_record/version.rb
@@ -1,7 +1,7 @@
module ActiveRecord
# Returns the version of the currently loaded ActiveRecord as a Gem::Version
def self.version
- Gem::Version.new "4.0.1.rc3"
+ Gem::Version.new "4.0.1.rc4"
end
module VERSION #:nodoc:
View
15 activerecord/test/cases/base_test.rb
@@ -607,10 +607,25 @@ def test_attr_readonly_is_class_level_setting
end
def test_unicode_column_name
+ Weird.reset_column_information
weird = Weird.create(:なまえ => 'たこ焼き仮面')
assert_equal 'たこ焼き仮面', weird.なまえ
end
+ def test_respect_internal_encoding
+ if current_adapter?(:PostgreSQLAdapter)
+ skip 'pg does not respect internal encoding and always returns utf8'
+ end
+ old_default_internal = Encoding.default_internal
+ silence_warnings { Encoding.default_internal = "EUC-JP" }
+
+ Weird.reset_column_information
+
+ assert_equal ["EUC-JP"], Weird.columns.map {|c| c.name.encoding.name }.uniq
+ ensure
+ silence_warnings { Encoding.default_internal = old_default_internal }
+ end
+
def test_non_valid_identifier_column_name
weird = Weird.create('a$b' => 'value')
weird.reload
View
2  activesupport/lib/active_support/version.rb
@@ -1,7 +1,7 @@
module ActiveSupport
# Returns the version of the currently loaded ActiveSupport as a Gem::Version
def self.version
- Gem::Version.new "4.0.1.rc3"
+ Gem::Version.new "4.0.1.rc4"
end
module VERSION #:nodoc:
View
2  railties/lib/rails/version.rb
@@ -3,7 +3,7 @@ module VERSION
MAJOR = 4
MINOR = 0
TINY = 1
- PRE = "rc3"
+ PRE = "rc4"
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
end
View
2  version.rb
@@ -3,7 +3,7 @@ module VERSION
MAJOR = 4
MINOR = 0
TINY = 1
- PRE = "rc3"
+ PRE = "rc4"
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
end

No commit comments for this range

Something went wrong with that request. Please try again.