mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity
47,282 Commits 56 Branches 544 Tags 410 MiB
Commit Graph

47282 Commits

Author SHA1 Message Date
Rafael Mendonça França 4af5899e25 Revert "Merge pull request #16966 from why-el/symbolize-path-params" 
This reverts commit 9d05d6de52, reversing
changes made to 0863c9248f.

The change in the behaviour reported at #16958 doesn't exist since 4.0
and 4.1 works in the same way
 2014-09-25 18:07:22 -03:00
Rafael Mendonça França 3a88535149 Merge pull request #17061 from bronzle/remove_extra_# 
remove extra # in css
 2014-09-25 18:02:53 -03:00
Abdelkader Boudih 419dfea7d0 Merge pull request #17059 from bronzle/remove_threadsafe_from_guides 
[ci skip] Remove reference to config.threadsafe! in guides/configuring.md
 2014-09-25 22:01:32 +01:00
Byron Bischoff fe1b02d5ac remove extra # in css 2014-09-25 13:53:45 -07:00
Byron Bischoff 5571fe8d40 [ci skip] Remove reference to config.threadsafe! in guides/configuriing.md 2014-09-25 13:43:27 -07:00
Rafael Mendonça França 9d05d6de52 Merge pull request #16966 from why-el/symbolize-path-params 
Ensure named path params are symbols (Fixes #16958)
 2014-09-25 17:40:37 -03:00
Mohamed Wael Khobalatte f10b38bbc8 Ensure named path params are symbols (Fixes #16958) 2014-09-25 17:40:26 -03:00
Rafael Mendonça França 0863c9248f No need CHANGLOG entry for a bug in a non released version 
[ci skip]
 2014-09-25 17:21:55 -03:00
Rafael Mendonça França bc644c54d6 Keep the original implementation to not having to allocate new objects 2014-09-25 17:20:52 -03:00
Rafael Mendonça França f82ecef9ae Merge pull request #17058 from eval/issue-17057 
Remove internal options from query string of paths
 2014-09-25 17:15:00 -03:00
Rafael Mendonça França b98c593bc8 No need to install the deprecated_sanitizer gem 
It is not being used in our tests
 2014-09-25 16:48:45 -03:00
Rafael Mendonça França 80990e2a0b rails-html-sanitizer is now the default 
Also add to upgrading guide a notice about the deprecated sanitizers
 2014-09-25 16:45:45 -03:00
Rafael Mendonça França 64fc8963b9 Remove unused code 2014-09-25 16:20:31 -03:00
Rafael Mendonça França 2922f63039 💅 the CSS 2014-09-25 16:09:43 -03:00
Rafael Mendonça França 89307fe2ce Merge pull request #17024 from buddhamagnet/amend-welcome-page 
Amend welcome page
 2014-09-25 16:07:19 -03:00
Jeremy Kemper 3f1d04e3bb Fix string/gid collision in job arguments 
Serialize Global IDs as special objects, distinguishable from Strings
 2014-09-25 10:00:19 -07:00
Godfrey Chan 391cfc2054 Fix actionpack test cases broken by #16888 2014-09-26 01:42:18 +09:00
Godfrey Chan b5571b3ccf Revert "Revert "Merge pull request #16888 from jejacks0n/render_template"" 
This reverts commit 585e75696b.
 2014-09-26 01:42:18 +09:00
Godfrey Chan b008e4bd8a Use released rails-html-sanitizer and rails-deprecated_sanitizer 2014-09-26 01:37:05 +09:00
buddhamagnet be0206e4e2 Improve welcome page css and table cell aignments. 2014-09-25 11:59:13 -04:00
Gert Goet 2d08fd2506 Remove internal options from query string of paths 
Fixes #17057
 2014-09-25 17:50:16 +02:00
Rafael Mendonça França 478ad3f930 Use release web-console 2014-09-25 12:35:06 -03:00
Rafael Mendonça França 2c0cad8034 Use released rails-dom-testing 2014-09-25 12:31:42 -03:00
Rafael Mendonça França f620299b27 Merge pull request #17051 from jwworth/task/fix_typo 
Fix typo
 2014-09-24 17:43:50 -03:00
Jake Worth 76eba917bc Fix typo 2014-09-24 15:38:51 -05:00
Rafael Mendonça França 2bb0fcb889 Merge pull request #17042 from DanOlson/remove-skip-action-view 
Remove --skip-action-view option from application generator
 2014-09-24 13:39:20 -03:00
Dan Olson 8e9bc11d22 Remove --skip-action-view option from application generator 2014-09-24 10:25:59 -05:00
Aaron Patterson 4e8ea13ba1 Merge pull request #17020 from Sirupsen/ar-override-rack-test 
activerecord/connection_pool: honor overidden rack.test in tests
 2014-09-23 07:54:03 -07:00
Arthur Nogueira Neves f8b44d1d33 Merge pull request #17032 from tgxworld/update_contributing_guide 
[CI SKIP] Improve force push note.
 2014-09-23 10:46:55 -04:00
Guo Xiang Tan c7bce61a22 [CI SKIP] Improve force push note. 2014-09-23 22:38:13 +08:00
Santiago Pastorino e88f8d7dcb Merge pull request #17029 from grk/fix-loading-fixtures-in-engine-tests 
Fix loading fixtures in engine tests
 2014-09-23 10:48:05 -03:00
Richard Schneeman 13e1348cba Merge pull request #17026 from prathamesh-sonpatki/mention-updating-pull-requests 
Added note about updating pull requests by force push
 2014-09-23 19:37:39 +09:00
Grzesiek Kolodziejczyk 95e3e42b87 Fix loading fixtures in engine tests 
fixture_path is a class attribute of ActiveSupport::TestCase, so
ActiveSupport::TestCase.method_defined?(:fixture_path=) would always
return false.

This should fix #4971
 2014-09-23 11:50:10 +02:00
Prathamesh Sonpatki 6aa11fbb1a Added note about updating pull requests by force push 
- Added note about force pushing same branch to update a existing pull
  request instead of opening new one in contributing guide.
- [ci skip]
 2014-09-23 18:15:30 +09:00
Yves Senn 017294066f Merge pull request #17005 from y-yagi/fix_aj_test_helper 
add message to `assert` in `assert_enqueued_with`
 2014-09-23 10:44:44 +02:00
Yves Senn 92cef19519 Merge pull request #17022 from prathamesh-sonpatki/test-for-validate-message 
Added test for exception message for validate method
 2014-09-23 10:36:36 +02:00
Prathamesh Sonpatki a7ed62987c Added test for exception message for validate method 
- Test case for https://github.com/rails/rails/pull/16851
 2014-09-23 14:36:15 +09:00
Simon Eskildsen cb598c2115 ar/connection_pool: honor overriden rack.test in middleware 
Honoring an overidden `rack.test` allows testing closed connection between
multiple requests. This is useful if you're working on database resiliency, to
ensure the connection is in the expected state from one request to another on
the same worker.
 2014-09-23 02:33:18 +00:00
Abdelkader Boudih fc6accfa9a Merge pull request #17018 from prathamesh-sonpatki/tenderlove 
Update changelog with tenderlove's entry
 2014-09-23 01:28:51 +01:00
Prathamesh Sonpatki a1e38ef33e Update changelog with tenderlove's entry 
[ci skip]
 2014-09-23 09:21:17 +09:00
yuuji.yaginuma 39bef5823f add message to `assert` in `assert_enqueued_with` 2014-09-23 08:50:32 +09:00
Aaron Patterson 9a4e183fe9 add a truncate method to the connection 
it doesn't work on SQLite3 since it doesn't support truncate, but that's
OK.  If you call truncate on the connection, you're now bound to that
database (same as if you use hstore or any other db specific feature).
 2014-09-22 14:57:19 -07:00
Rafael Mendonça França 53a8a7f9cb Merge pull request #17012 from petedmarsh/clarify-association-primary-key-option-documentation 
Clarify the documentation of the primary_key option for associations
 2014-09-22 16:28:19 -03:00
Peter Marsh 949deedf08 Clarify the documentation of the primary_key option for associations 
Previously the documentation stated that `primary_key` should be the name of
a *method* that returns the primary key used for the association. This is
incorrect. This changes the documentation to say that the value must be the
name of a column.
 2014-09-22 20:27:03 +01:00
Rafael Mendonça França f4595e624b Merge pull request #16963 from collectiveidea/activejob-dj 
Cleaner queuing of jobs using Delayed Job

Conflicts:
	activejob/lib/active_job/queue_adapters/delayed_job_adapter.rb
 2014-09-22 14:33:29 -03:00
Rafael Mendonça França b61a2db8d0 Merge pull request #17009 from arthurnn/foreign_key_symbols 
Fixtures using Foreign key symbols
 2014-09-22 14:23:40 -03:00
Arthur Neves c36ca0547f
Better regression test for Fixtures with fk as a symbol 2014-09-22 13:12:19 -04:00
Will Bryant 2a1b45af56
fix fixtures not loading if a belongs_to association is defined with a :foreign_key option that's a symbol 2014-09-22 13:10:55 -04:00
Godfrey Chan 585e75696b Revert "Merge pull request #16888 from jejacks0n/render_template" 
This reverts commit 07635a74b5, reversing
changes made to 1b5f61a025.

Reason: it's not ready 💣, see https://github.com/rails/rails/pull/16888#issuecomment-56400816
 2014-09-23 02:06:08 +09:00
Godfrey Chan ca67632674 Move the array to a constant 2014-09-23 01:59:43 +09:00