aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #16481 from sgrif/sg-change-default-timestampsDavid Heinemeier Hansson2014-08-1714-27/+105
|\
| * Change the default `null` value for timestampsSean Griffin2014-08-1214-27/+105
* | Merge pull request #16294 from bf4/code_toolsRafael Mendonça França2014-08-175-127/+159
|\ \
| * | Encapsulate rake lines from ActiveRecord/ActionPack as CodeTools::LineStatisticsBenjamin Fleischer2014-07-253-42/+47
| * | Fail profiler fast when input is not a ruby fileBenjamin Fleischer2014-07-251-0/+12
| * | Optionally add String extensions for ruby-prof printer optionBenjamin Fleischer2014-07-251-0/+26
| * | Encapsulate tools/profile functionality in CodeTools::ProfilerBenjamin Fleischer2014-07-251-52/+76
| * | Correct tools/profile usage exampleBenjamin Fleischer2014-07-251-1/+1
| * | Remove unused, broken, legacy ruby-prof extension from 2005Benjamin Fleischer2014-07-251-35/+0
* | | Add CHANGELOG entry for #deliver_laterDavid Heinemeier Hansson2014-08-171-0/+7
* | | Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2014-08-1781-10/+2220
|\ \ \
| * \ \ Merge pull request #16485 from seuros/activejobDavid Heinemeier Hansson2014-08-1780-9/+2219
| |\ \ \
| | * | | [ActiveJob] require global_id/railtieAbdelkader Boudih2014-08-171-1/+1
| | * | | [ActiveJob] raise DeserializationError when got an error deserializingCristian Bica2014-08-174-0/+27
| | * | | [ActiveJob] Add deserialize_arguments method to jobAbdelkader Boudih2014-08-171-1/+7
| | * | | [ActiveJob] Fix tests for sucker_punchAbdelkader Boudih2014-08-178-12/+32
| | * | | [ActiveJob] Use globalid gemAbdelkader Boudih2014-08-179-14/+11
| | * | | [ActiveJob] make the resque-scheduler optionalCristian Bica2014-08-171-3/+6
| | * | | [ActiveJob] remove ruby warningsAbdelkader Boudih2014-08-172-3/+3
| | * | | [ActiveJob] Convert ActiveJob::Arguments into moduleAbdelkader Boudih2014-08-171-6/+7
| | * | | [ActiveJob] require files in logging.rbAbdelkader Boudih2014-08-171-0/+2
| | * | | [ActionMailer] Rename ActionMailer::DelayedDeliveryJob to ActionMailer::Deliv...Abdelkader Boudih2014-08-174-8/+10
| | * | | [ActiveJob] Fix test syntaxAbdelkader Boudih2014-08-171-10/+10
| | * | | ActiveJob guides improvements [ci skip]Cristian Bica2014-08-161-108/+29
| | * | | Added docs for AJ::Callbacks; Added AJ to docs build mapCristian Bica2014-08-162-4/+115
| | * | | Fixed indentationCristian Bica2014-08-161-1/+1
| | * | | Moved AR testing from using global variable to thread variableCristian Bica2014-08-167-15/+15
| | * | | Suggest the perform method can take arguments when generating an ActiveJob jobCristian Bica2014-08-151-2/+2
| | * | | ActiveJob: Reworked queue_base_name as default_queue_name + Allow configure A...Cristian Bica2014-08-154-11/+23
| | * | | Removed method missing from ActionMailer::MessageDeliveryCristian Bica2014-08-152-4/+4
| | * | | Update resque_adapter.rbAbdelkader Boudih2014-08-141-1/+1
| | * | | Added ActiveJob configuration for travisCristian Bica2014-08-142-2/+3
| | * | | Refactor DeliverLater into MessageDeliveryAbdelkader Boudih2014-08-149-83/+73
| | * | | Make ActionMailer::Previews methods class methods.Abdelkader Boudih2014-08-142-0/+8
| | * | | Update ActiveJob guide [ci skip]Cristian Bica2014-08-131-3/+12
| | * | | Merge branch 'master' into activejobCristian Bica2014-08-1319-39/+78
| | |\ \ \
| | * | | | [ci skip] First version of the Active Job guideCristian Bica2014-08-131-0/+323
| | * | | | Clean adapter_test.rb and skip test for sidekiq in unsupported rubiesAbdelkader Boudih2014-08-133-64/+33
| | * | | | Added ActionMailer::DeliverLaterAbdelkader Boudih2014-08-1311-10/+163
| | * | | | Modified activejob.gemspec to match other rails gems formatCristian Bica2014-08-121-4/+6
| | * | | | Update activejob's READMECristian Bica2014-08-121-7/+28
| | * | | | Added activejob to install.rbCristian Bica2014-08-121-1/+1
| | * | | | Fixed failing tests; Load active_job in railtie; Renamed generator to jobCristian Bica2014-08-125-5/+9
| | * | | | Remove activejob integration testsAbdelkader Boudih2014-08-1250-713/+65
| | * | | | Add 'activejob/' from commit '14f74a8331f94150dfee653224de8fc837797709'Abdelkader Boudih2014-08-12104-0/+2276
| | |\ \ \ \
| | | * \ \ \ Merge pull request #102 from cristianbica/integration_testsDavid Heinemeier Hansson2014-08-0845-52/+574
| | | |\ \ \ \
| | | | * | | | Integration testingCristian Bica2014-08-0845-52/+574
| | | |/ / / /
| | | * | | | Merge pull request #103 from cristianbica/adapter-fixesDavid Heinemeier Hansson2014-08-063-9/+13
| | | |\ \ \ \
| | | | * | | | Fixed qu, queue_classic, sneakers adaptersCristian Bica2014-08-073-9/+13
| | | |/ / / /
| | | * | | | Fix the test requirement of resque_schedulerDavid Heinemeier Hansson2014-08-011-3/+7