aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge pull request #20094 from vngrs/refactor_railties_commandsRafael Mendonça França2015-05-104-109/+103
|\ \ | | | | | | Refactor railties console and dbconsole commands
| * | Refactor railties console and dbconsole commandsMehmet Emin İNAÇ2015-05-104-109/+103
|/ / | | | | | | fix minor convention problems
* | Merge pull request #20087 from kuldeepaggarwal/fix-engine-guidesYves Senn2015-05-091-2/+2
|\ \ | | | | | | correct error text message in engines.md [ci skip]
| * | [CI SKIP] correct error text messagekuldeepaggarwal2015-05-091-2/+2
| | |
* | | Merge pull request #20086 from farukaydin/before-action-docEileen M. Uchitelle2015-05-091-1/+1
|\ \ \ | |/ / |/| | promote :except option instead of :only for before action docs [ci skip]
| * | promote :except option instead of :only for before action docs [ci skip]Faruk AYDIN2015-05-091-1/+1
| | |
* | | Move `TemplateAssertions` to their own fileeileencodes2015-05-092-188/+189
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves `TemplateAssertions` out of the `test_case.rb` file and into it's own `template_assertions` file. It still inherits from `ActionController`.` This is in preparation for combining the code for Integration tests and Controller tests. This will need to be it's own file to be added to the `requires` for Integration tests. This does not currently change ANY behavior, just moving it for access later on.
* | | Merge pull request #20085 from y-yagi/improve_assert_emails_msgYves Senn2015-05-093-1/+17
|\ \ \ | |/ / |/| | `assert_emails` in block form use the given number as expected value
| * | `assert_emails` in block form use the given number as expected valueyuuji.yaginuma2015-05-093-1/+17
|/ /
* | Merge pull request #20081 from gouravtiwari/patch-3Arun Agrawal2015-05-081-2/+2
|\ \ | | | | | | minor rdoc syntax fix [ci skip]
| * | minor rdoc syntax fix [ci skip]Gourav Tiwari2015-05-081-2/+2
|/ /
* | Merge pull request #20079 from ankit8898/aj_allArun Agrawal2015-05-081-0/+1
|\ \ | | | | | | docs: syncing with the code, adding aj [ci skip]
| * | docs: syncing with the code, adding aj [ci skip]Ankit Gupta2015-05-081-0/+1
| | |
* | | Merge pull request #20078 from robertjlooby/fix_generated_features_methods_docsRafael Mendonça França2015-05-081-1/+1
|\ \ \ | | | | | | | | change GeneratedFeatureMethods to GeneratedAssociationMethods in docs
| * | | change GeneratedFeatureMethods to GeneratedAssociationMethods in docsRob Looby2015-05-081-1/+1
|/ / / | | | | | | | | | the module name was changed in 8e814a0ac0768816974d2bfd68d33d931592751e
* | | Merge pull request #20064 from kddeisz/qu_provider_job_idRafael Mendonça França2015-05-084-9/+16
|\ \ \ | | | | | | | | Provide provider_job_id to qu adapter.
| * | | Provide provider_job_id to qu adapter.Kevin Deisz2015-05-074-9/+16
| | | | | | | | | | | | | | | | Further work to provide provider_job_id for queue adapters.
* | | | Merge pull request #20074 from ankit8898/as_core_ext_req_notRafael Mendonça França2015-05-082-2/+0
|\ \ \ \ | | | | | | | | | | as/core_ext require's not used
| * | | | as/core_ext require's not usedAnkit Gupta2015-05-082-2/+0
| | |/ / | |/| |
* | | | Merge pull request #20075 from gouravtiwari/patch-2Rafael Mendonça França2015-05-081-8/+12
|\ \ \ \ | | | | | | | | | | Better formatted documents [ci skip]
| * | | | Better formatted documents [ci skip]Gourav Tiwari2015-05-081-8/+12
|/ / / /
* | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-05-087-14/+15
|\ \ \ \
| * | | | [ci skip] Add an example to ActionView::Helpers::FormBuilder#labelyui-knk2015-05-081-0/+1
| | | | |
| * | | | Updated titles of headers in Action Mailer guidePrathamesh Sonpatki2015-04-281-2/+2
| | | | |
| * | | | Replaced Javascript with JavaScript in guidesPrathamesh Sonpatki2015-04-282-2/+2
| | | | |
| * | | | Add missing "of" to RequestForgeryProtection doc.Hendy Tanata2015-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | Fix method name for building associated object in nested_model_forms guidePrathamesh Sonpatki2015-04-251-1/+1
| | | | |
| * | | | [ci skip] fix count of options for `find_each`Mikhail Dieterle2015-04-231-1/+1
| | | | |
| * | | | [ci skip] `deep_dup` is instance method of `Hash`yui-knk2015-04-221-1/+1
| | | | |
| * | | | [ci skip] `deep_dup` is instance method of `Array`yui-knk2015-04-211-1/+1
| | | | |
| * | | | [ci skip] Fix returned values of code sampleyui-knk2015-04-191-6/+6
| | | | |
* | | | | Merge pull request #20072 from vngrs/refactor_active_job_sidekiq_adapterYves Senn2015-05-081-6/+2
|\ \ \ \ \ | | | | | | | | | | | | Refactor sidekiq adapter enqueue and enqueue_at methods
| * | | | | Refactor sidekiq adapter enqueue and enqueue_at methodsMehmet Emin İNAÇ2015-05-081-6/+2
| | |/ / / | |/| | |
* | | | | Merge pull request #20073 from ↵Yves Senn2015-05-081-2/+0
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | vngrs/remove_test_order_from_activejob_test_helper Don't need to explicitly set test_order it's :random default
| * | | | Don't need to explicitly set test_order it's :random defaultMehmet Emin İNAÇ2015-05-081-2/+0
|/ / / /
* | | | Merge pull request #20068 from mcfiredrill/nodoc-postgresql-rename-columnYves Senn2015-05-081-1/+1
|\ \ \ \ | | | | | | | | | | :nodoc: rename_column in postgresql/schema_statements.rb [ci skip]
| * | | | :nodoc: rename_column in postgresql/schema_statements.rbTony Miller2015-05-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Its already doc'ed in activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
* | | | | remove duplicate test.Yves Senn2015-05-081-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old `test_create_bang_returns_falsy_when_join_record_has_errors` had a missleading name and was a duplicate of `test_save_should_not_raise_exception_when_join_record_has_errors`. Since it had an assertion on the return value I renamed it accordingly and got rid of the duplicate test.
* | | | | Merge pull request #20066 from ankit8898/initializationZachary Scott2015-05-071-0/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | added activejob in list [ci skip]
| * | | | added activejob in list [ci skip]Ankit Gupta2015-05-071-0/+1
|/ / / /
* | | | Merge pull request #20063 from trayo/masterRafael Mendonça França2015-05-071-0/+10
|\ \ \ \ | | | | | | | | | | Adds documentaion for the Rails.root and Rails.public_path methods
| * | | | better docs for Rails.root and Rails.public_pathTravis Yoder2015-05-071-0/+10
| | | | |
* | | | | Merge pull request #20056 from jvanbaarsen/sidekiq-job-idRafael Mendonça França2015-05-074-10/+22
|\ \ \ \ \ | | | | | | | | | | | | Let Sidekiq and Que set provider_job_id
| * | | | | Make que report back its job_id to provider_job_idJeroen van Baarsen2015-05-073-20/+13
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
| * | | | | Let Sidekiq set provider_job_idJeroen van Baarsen2015-05-073-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a job is added to Sidekiq by ActiveJob, make sure we still can get the original job_id provider by Sidekiq. We do this by adding the sidekiq jid to provider_job_id field on the job object. Partly fixes #18821 Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | | | | | Merge pull request #20062 from gouravtiwari/patch-1Rafael Mendonça França2015-05-071-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Changed to static value of id in comments [ci skip]
| * | | | | Updated dynamic value of id in comments [ci skip]Gourav Tiwari2015-05-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | In help text for method, dynamic value makes it hard to understand, so replaced with static value matching with example above
* | | | | | Merge pull request #19910 from kddeisz/delayed_job_provider_job_idRafael Mendonça França2015-05-074-2/+22
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Get provider_job_id from DelayedJob
| * | | | | Get provider_job_id from DelayedJobKevin Deisz2015-05-054-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When queueing with DelayedJob, get the id of the job instance and report it back to ActiveJob as provider_job_id.
* | | | | | Merge pull request #20061 from ankit8898/atomfeed-example-updateRafael Mendonça França2015-05-071-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Example updated [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 11:23:00 +0000