AtHeartEngineer/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-09 14:48:08 -05:00
Code Issues Packages Projects Releases Wiki Activity
28,425 Commits 34 Branches 105 Tags
5e277c82085f6258b6aa4a19a90c6ea46686af84
Commit Graph

28425 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aaron Patterson
5e277c8208 bumping version to 3.2.15.rc1 2013-10-03 11:52:44 -07:00
Aaron Patterson
31c79e291f Merge pull request #12084 from Ben-M/3-2-stable 
Fix STI scopes using benolee's suggestion. Fixes #11939
 2013-10-03 11:14:19 -07:00
Andrew White
83c4b0a7f9 Merge pull request #12410 from tamird/fix-ip-spoof-errors 
Fix ip spoof errors
 2013-10-01 01:28:07 -07:00
Tamir Duberstein
85106decc4 make sure both headers are set before checking for ip spoofing 2013-10-01 01:26:07 -07:00
Rafael Mendonça França
ccd11d5891 Merge pull request #12413 from arthurnn/inverse_of_on_build 
Inverse of on build
 2013-09-30 14:38:58 -07:00
Arthur Neves
679860400f Move set_inverse_instance to association.build_record 
[fixes #10371]
 2013-09-30 17:20:26 -04:00
Rafael Mendonça França
54c05acdba Merge pull request #12375 from arthurnn/inverse_after_find_or_initialize 
Inverse after find or initialize
 2013-09-28 17:22:01 -07:00
Rafael Mendonça França
50a96446bc Use Ruby 1.8 hash syntax 2013-09-28 20:56:15 -03:00
Arthur Neves
fed6ac9c66 fix inverse_of when find_or_initialize_by_* 
inverse_of relation was not being set when calling find_or_initialize_by_ and the entry was
found on the db.
 2013-09-26 14:55:10 -04:00
Rafael Mendonça França
e82cecae35 Merge pull request #12364 from arthurnn/test_fix_validate 
Fix query counters when testing with IdentityMap on 3.2
 2013-09-25 19:08:14 -07:00
Arthur Neves
e1bb9fc671 on tests: dont always touch firm on validate 2013-09-25 19:50:42 -04:00
Rafael Mendonça França
fdc3c08e55 Merge pull request #12359 from arthurnn/inverse_on_callbacks 
Make sure inverse_of is visible on the has_many callbacks
Conflicts:
	activerecord/CHANGELOG.md
	activerecord/test/models/company.rb
 2013-09-25 16:31:00 -03:00
Rafael Mendonça França
c539c684aa Merge pull request #12196 from h-lame/fix-activesupport-cache-filestore-cleanup 
Fix FileStore#cleanup to no longer rely on missing each_key method
Conflicts:
	activesupport/CHANGELOG.md
	activesupport/test/caching_test.rb
 2013-09-12 16:04:10 -03:00
Eugene Kalenkovich
c9642e31b1 Fix FinderMethods#last unscoped primary key 
Fixes table.joins(:relation).last(N) breaking on sqlite

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/test/cases/finder_test.rb
 2013-09-12 14:08:02 -03:00
Steve Klabnik
cff8d1d24d Merge pull request #9368 from CrowdFlower/3-2-stable 
PR #5219 backported to 3-2
 2013-09-10 13:23:57 -07:00
Santiago Pastorino
143e009546 Merge pull request #12176 from arthurnn/ar32_schema_cache 
on SchemaCache use the connection getter instead of the obj given
 2013-09-10 07:14:52 -07:00
Arthur Neves
f0301e3de6 on SchemaCache use the connection getter instead of the obj given 2013-09-09 13:47:07 -04:00
Brian Hahn
03ac291526 pass the extra params to the rack test environment so that routes with block constraints have access 2013-09-06 11:08:41 -07:00
Ben Maraney
cf1904f65b Fix STI scopes using benolee's suggestion. Fixes #11939 2013-08-30 12:58:41 +03:00
Aaron Patterson
59a3561045 Merge pull request #12048 from tjouan/app_generator-bin_perms-umask 
Comply with current umask when generating new app
Conflicts:
	railties/lib/rails/generators/rails/app/app_generator.rb
 2013-08-27 14:06:13 -07:00
Rafael Mendonça França
e0fc5da353 Merge pull request #12006 from kassio/11605-render-with-context-format 
Render with context format
 2013-08-25 19:31:42 -07:00
Kassio Borges
424a5a7d46 fix issue #11605 2013-08-24 15:24:36 -03:00
Eugene Kalenkovich
adf6e30e3a Fix 1.8.7 incompatible respond_to_missing 2013-08-18 16:46:44 -05:00
Guillermo Iguaran
6d9050bae4 Merge pull request #11930 from UncleGene/ties_test 
Fix test incompatible with 1.8.7
 2013-08-18 11:27:01 -07:00
Eugene Kalenkovich
93f1a7219b Fix test incompatible with 1.8.7 2013-08-18 11:20:31 -07:00
Teng Siong Ong
946ad5d9f9 Make rake doc:guides works again. Fix #10384. 
Conflicts:
	railties/guides/rails_guides.rb
	railties/lib/rails/tasks/documentation.rake
 2013-08-05 16:02:17 -04:00
Rafael Mendonça França
5f8a7d1d4d Merge pull request #11765 from kassio/load-fixtures-from-linked-folder 
Load fixtures from linked folder
 2013-08-05 12:56:31 -07:00
Kassio Borges
0ec701d50b Load fixtures from linked folders 2013-08-05 16:52:12 -03:00
Rafael Mendonça França
773eca0e12 Move changelog entry to the top [ci skip] 2013-07-30 21:59:10 -03:00
Rafael Mendonça França
1463fbeafb Fix broken test 
quote_value is called on the object not the class
 2013-07-24 16:21:37 -03:00
Ben Woosley
b4dea61a42 Tidy up the "Specified column type for quote_value" changes 
This includes fixing typos in changelog, removing a deprecated
mocha/setup test require, and preferring the `column_for_attribute`
accessor over direct access to the columns_hash in the new code.

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/locking/optimistic.rb
 2013-07-24 13:20:30 -03:00
Alfred Wong
33e1604b3e Specified column type for quote_value 
When calling quote_value the underlying connection sometimes requires
more information about the column to properly return the correct quoted
value.

I ran into this issue when using optimistic locking in JRuby and the
activerecord-jdbcmssql-adapter. In SQLSever 2000, we aren't allowed to
insert a integer into a NVARCHAR column type so we need to format it as
N'3' if we want to insert into the NVARCHAR type. Unfortuantely, without
the column type being passed the connection adapter cannot properly return
the correct quote value because it doesn't know to return N'3' or '3'.

This patch is fairly straight forward where it just passes in the column
type into the quote_value, as it already has the ability to take in the column,
so it can properly handle at the connection level.

I've added the tests required to make sure that the quote_value method
is being passed the column type so that the underlying connection can
determine how to quote the value.

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/locking/optimistic.rb
 2013-07-24 13:18:21 -03:00
Rafael Mendonça França
c4b93f57e1 Merge pull request #11563 from 90yukke/fix-nomethoderror-on-non-attribute-equalities 
Fix merge error when Equality LHS is non-attribute.
 2013-07-23 05:29:17 -07:00
90yukke
b289519f4f Fix merge error when Equality LHS is non-attribute. 
This is reworking of rails/rails/pull/7380 made for rails 3.
 2013-07-23 10:38:00 +03:00
Rafael Mendonça França
e0db277be0 Fix actionpack CHANGELOG entry 
It was included by git on the wrong release
 2013-07-22 20:25:20 -03:00
Rafael Mendonça França
2b3ce8627b Merge branch '3-2-14' into 3-2-stable 2013-07-22 20:24:09 -03:00
Rafael Mendonça França
c69ccea6f2 Fix activemodel CHANGELOG 2013-07-22 20:23:42 -03:00
Rafael Mendonça França
2fcd13eff2 Preparing for 3.2.14 release 2013-07-22 12:05:41 -03:00
Rafael Mendonça França
47fb44fc7a Update CHANGELOG entry 2013-07-22 11:57:02 -03:00
Andrew White
d8353073d1 Add test to prevent route reloading regression 
Journey doesn't clear its named route hash when the routes are reloaded but
Rails 3.2 isn't affected because Journey overwrites the existing route. This
is just a backport of the test to make sure it doesn't become affected in
some future release.
 2013-07-21 17:48:24 +01:00
Rafael Mendonça França
ed19c02c8d Merge pull request #11486 from wolframarnold/3-2-stable_fix_respond_to_missing_in_tagged_loggging 
3-2-stable patch: Add respond_to_missing? in TaggedLoggging
 2013-07-18 10:46:52 -07:00
Rafael Mendonça França
39441f78e3 Merge pull request #10800 from 907th/fix-custom-message-for-assert_redirected_to 
Fix #10842. `assert_redirected_to` does not show user-supplied message.
 2013-07-17 22:12:42 -07:00
Alexey Chernenkov
0f5ba6e124 Fix assert_redirected_to does not show user-supplied message. 
Issue: when `assert_redirected_to` fails due to the response redirect not
matching the expected redirect the user-supplied message (second parameter)
is not shown. This message is only shown if the response is not a redirect.
 2013-07-18 10:54:36 +06:00
Wolfram Arnold
803008eb97 Add respond_to_missing? for TaggedLogging which is needed if another log abstracter wraps a TaggedLogging instance. 
It's also best practice when overriding method_missing.
 2013-07-17 18:26:55 -07:00
Carlos Antonio da Silva
ac5cc69571 Merge pull request #11468 from arunagw/removed_unsed_test 
Removed unused test file
 2013-07-17 09:49:06 -07:00
Arun Agrawal
fc0faaa590 Removed unused test file 
This test file is not be running from a long time
This test is already covered in controller/caching_test.rb
 2013-07-17 11:47:24 +02:00
Rafael Mendonça França
a96df04aac Preparing for 3.2.14.rc2 release 2013-07-16 13:00:33 -03:00
Rafael Mendonça França
1900a56669 Use Ruby 1.8 syntax 2013-07-15 17:45:20 -03:00
Rafael Mendonça França
66cba60103 Use Ruby 1.8 syntax 2013-07-15 17:44:49 -03:00
Yves Senn
1c2545a455 Merge pull request #11451 from jetthoughts/11450_do_not_resave_destroyed_association 
Do not re-save destroyed association on saving parent object
Conflicts:
	activerecord/lib/active_record/autosave_association.rb

Conflicts:
	activerecord/CHANGELOG.md
 2013-07-15 15:49:42 -03:00