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

46015 Commits

Author SHA1 Message Date
Cristian Bica 3ed69cd5f5 Fixed failing tests; Load active_job in railtie; Renamed generator to job 2014-08-12 13:53:46 +03:00
Abdelkader Boudih 0c232779ec Remove activejob integration tests 2014-08-12 10:07:21 +00:00
Abdelkader Boudih a75f085941 Add 'activejob/' from commit '14f74a8331f94150dfee653224de8fc837797709' 
git-subtree-dir: activejob
git-subtree-mainline: b45b99894a
git-subtree-split: 14f74a8331
 2014-08-12 09:17:19 +00:00
Santiago Pastorino b45b99894a Merge pull request #16456 from lsylvester/improve-active-record-error-message-on-update_columns-for-destroyed-records 
Change error message in update_columns for destroyed objects
 2014-08-11 09:11:31 -03:00
lsylvester 0f99aa615e update error message to reflect that the record could have been destroyed 2014-08-11 20:56:21 +10:00
Godfrey Chan 49798b52bf Merge pull request #16300 from vast/mention-changes-to-nil-serialization-in-upgrading-from-3.2 
Mention changes to `nil` handling in serialized attributes
 2014-08-10 20:31:10 -07:00
Zachary Scott 7bd9c874c6 Merge pull request #16453 from reshleman/re-cleanup-guides-guidelines 
Cleanup Guides Guidelines [ci skip]
 2014-08-10 19:52:59 -07:00
Robert Eshleman d71433d7d4 Cleanup Guides Guidelines [ci skip] 
* Copy editing for clarity in several locations
* Rename "Titles" section to "Headings"
* Fix incorrect anchor in link to API Documentation Guidelines for filenames
 2014-08-10 19:53:00 -04:00
Zachary Scott d0cdc96919 Merge pull request #16451 from y-yagi/patch-2 
[ci skip] Fix sample code in engines guide
 2014-08-10 10:24:51 -07:00
yuuji.yaginuma 38e8bb8301 [ci skip] Fix sample code in engines guide 2014-08-10 22:10:15 +09:00
Santiago Pastorino ff24041062 Merge pull request #16441 from tomkadwill/activerecord_associations_options_param 
[ci skip] Changed options to +options+ for rdoc
 2014-08-09 10:43:13 -03:00
Santiago Pastorino 9c6c5aa929 Merge pull request #16440 from tgxworld/pass_log_in_block 
Pass block for logging.
 2014-08-09 10:42:45 -03:00
Santiago Pastorino 7bb5a8f590 Merge pull request #16439 from voxxit/patch-1 
Using delegated connection method
 2014-08-09 10:41:22 -03:00
Vijay Dev fb9d9da2cd Merge pull request #16443 from duccioarmenise/patch-1 
Rails Tutorial link updated
 2014-08-09 15:52:13 +05:30
Duccio Armenise d9b1c9ba01 Update README.md 
Ruby on Rails Tutorial link updated.
 2014-08-09 10:25:40 +02:00
Tom Kadwill b7176ab9b5 [ci skip] Changed options to +options+ for rdoc 2014-08-09 08:52:15 +01:00
Guo Xiang Tan bc53543cb3 Pass block for logging. 
This follows the good practice listed on http://guides.rubyonrails.org/debugging_rails_applications.html#impact-of-logs-on-performance.
 2014-08-09 13:47:24 +08:00
Joshua Delsman 8e490827d8 Using delegated connection method 2014-08-08 22:16:28 -07:00
Richard Schneeman ebcbcf97e0 Merge pull request #16437 from mscoutermarsh/master 
Docs: grammar fix for fetch. [ci skip]
 2014-08-08 21:17:37 -05:00
Mike Coutermarsh a8863fbb49 Docs: grammar fix for fetch. [ci skip] 2014-08-08 21:13:30 -04:00
Santiago Pastorino d70ba48c4d Revert "Merge pull request #16434 from strzalek/cookies-digest-config-option" 
This reverts commit 7059776205, reversing
changes made to dde91e9bf5.

IT BROKE THE BUILD!!!
 2014-08-08 18:20:33 -03:00
Santiago Pastorino 7059776205 Merge pull request #16434 from strzalek/cookies-digest-config-option 
Add digest config option for SignedCookiesJar
 2014-08-08 18:05:53 -03:00
Łukasz Strzałkowski 629f4e007c Return preconfigured AS::MessageVerifier 2014-08-08 21:24:02 +02:00
Łukasz Strzałkowski cfbedd3479 Add config option for cookies digest 
You can now configure custom digest for cookies in the same way as `serializer`:

config.action_dispatch.cookies_digest = \SHA256'
 2014-08-08 21:20:27 +02:00
Aaron Patterson dde91e9bf5 save a hash allocation per request. 2014-08-08 11:41:54 -07:00
Aaron Patterson 5b27f1ea18 add a test for prepending SCRIPT_NAME to generated urls 2014-08-08 11:41:21 -07:00
Santiago Pastorino 763d54b17a Merge pull request #16429 from arunagw/aa-build-fix-gemfile-spring 
Fixes test for Gemfile entry changes
 2014-08-08 15:06:10 -03:00
Arun Agrawal 301b5fd522 Fixes test for Gemfile entry changes 
Broken by fbe38c9e9d
 2014-08-08 19:50:25 +02:00
David Heinemeier Hansson 14f74a8331 Merge pull request #102 from cristianbica/integration_tests 
Integration testing
 2014-08-08 09:15:30 -07:00
Guillermo Iguaran c69e21d36b Merge pull request #16427 from ryandao/full_stack_source_extract 
Full stack source extract
 2014-08-08 10:00:18 -05:00
Santiago Pastorino 7a3d8e20de Merge pull request #16426 from tgxworld/fix_false_positive 
Fixes to TestCaseTest.
 2014-08-08 11:33:10 -03:00
Robin Dupret f4c8ce9dc8 Fix the #const_regexp's documentation [ci skip] 
Originally introduced in f9086d63, the documentation of this method is
wrong as #const_regexp returns a string to easy the interpolation inside
regular expressions.
 2014-08-08 16:13:38 +02:00
Rafael Mendonça França ca9851ae18 Merge pull request #16430 from guillermo/patch-1 
Fix typo in plugins doc
 2014-08-08 11:05:02 -03:00
Guillermo Álvarez Fernández b20d11133d Fix typo in plugins doc 2014-08-08 15:13:40 +02:00
Carlos Antonio da Silva 700968e5fe Merge pull request #16428 from tomkadwill/activerecord_associations_name_param 
[ci skip] Changed 'first argument' to '+name+ argument'
 2014-08-08 08:35:57 -03:00
Tom Kadwill 9ef0f0f69f [ci skip] Changed 'first argument' to '+name+ argument' 2014-08-08 10:00:23 +01:00
Ryan Dao 28595e0128 Update actionpack CHANGELOG 2014-08-08 15:04:55 +07:00
Ryan Dao 1ed264bc60 Retrieve source code for the entire stack trace 
Provide the ability to extract the source code of the entire exception stack
trace, not just the frame raising the error. This improves debugging
capability of the error page, especially for framework-related errors.
 2014-08-08 15:04:55 +07:00
Cristian Bica 664546c208 Integration testing 2014-08-08 10:52:16 +03:00
Guo Xiang Tan aaef6a3860 Fixes to TestCaseTest. 2014-08-08 12:29:52 +08:00
Zachary Scott 30529dc00f Rephrase how we explain RecordInvalid exception in the context of 
`#create!` regarding validations in contrast to the behavior of
`#create`. Also describe creating multiple objects using an array of
hashes as the +attributes+ parameter. [ci skip] /cc #16384
 2014-08-07 19:05:21 -07:00
Zachary Scott f18552a872 Merge pull request #16384 from tomkadwill/improved_create_documentation 
[ci skip] Added +object+ and +attributes+ to create! description for rdoc
 2014-08-07 19:01:45 -07:00
David Heinemeier Hansson fbe38c9e9d Pull spring gem entry into the Gemfile template instead of gemfile_entries so it can be grouped with the other development tools 2014-08-07 16:34:27 -07:00
David Heinemeier Hansson 089661b69a Merge branch 'master' of github.com:rails/rails 2014-08-07 16:10:20 -07:00
David Heinemeier Hansson cc1de71bfa Stop using padding in the generated Gemfile -- it looks shit 2014-08-07 16:10:14 -07:00
Aaron Patterson e81453ef92 need to call super 2014-08-07 16:03:09 -07:00
Aaron Patterson 8121eefc22 add a new constructor that runs load hooks 2014-08-07 15:50:46 -07:00
Aaron Patterson 2296989826 defer running after_config hooks until after the object is allocated 2014-08-07 15:28:53 -07:00
Rafael Mendonça França 42c569e71e Merge pull request #16424 from gregors/remove_dead_code 
remove dead file_watcher code
 2014-08-07 19:01:46 -03:00
Gregory Ostermayr 6c9669e8f0 remove dead file_watcher code 2014-08-07 16:19:20 -04:00