aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ci skip] Fix comment indentyui-knk2015-05-121-1/+1
| | | | | See commit 890da514, this is not intended. So fix indent.
* 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]
| * | | | | Example updated [ci skip]Ankit Gupta2015-05-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Should be ApplicationController not ApplicationController::Base
* | | | | | Merge pull request #20060 from ankit8898/typoRafael Mendonça França2015-05-071-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Typo fix [ci skip]
| * | | | | Typo fix [ci skip]Ankit Gupta2015-05-071-1/+1
|/ / / / / | | | | | | | | | | | | | | | Single brackets
* | | | | Merge pull request #20049 from iamvery/patch-1Yves Senn2015-05-071-1/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Amend `next_week` documentation [ci skip]
| * | | | | Add examples of Date and Time `next_week` usageJay Hayes2015-05-071-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | [skip ci]
* | | | | | tests, extract helpers to modify global state.Yves Senn2015-05-071-46/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that tests do not hardcode the default value. For example `test_instantiation_doesnt_try_to_require_corresponding_file` always restored the configuration to `true` regardless of what it's original value was. Extract a helper to make the global modification consistent across tests.
* | | | | | Merge pull request #20055 from davydovanton/doc-fix-typosKasper Timm Hansen2015-05-072-2/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | [skip ci] Fix typos in actionpack changelog and security guide
| * | | | | [skip ci] Fix typos in actionpack changelog and security guideAnton Davydov2015-05-072-2/+2
|/ / / / /
* | | | | Merge pull request #20051 from ankit8898/railtiesYves Senn2015-05-071-1/+0
|\ \ \ \ \ | | | | | | | | | | | | removing require object/blank
| * | | | | require object/blank not usedAnkit Gupta2015-05-061-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | the current class is not the blank?, present? as well as other inheriting, the test suite runs
* | | | | | s/snipped/snippet for @senny :trollface:Zachary Scott2015-05-061-1/+1
| | | | | |
* | | | | | Merge pull request #20040 from ankit8898/routeZachary Scott2015-05-061-0/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Docs: Adding a note, snipped for brevity [ci skip]
| * | | | | Adding a note, snipped for brevityAnkit Gupta2015-05-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | sudden ending of form looks incomplete and catches [ci skip]
* | | | | | Merge pull request #20047 from mcfiredrill/make-subquery-for-privateRafael Mendonça França2015-05-061-13/+13
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | make AbstractAdapter#subquery_for private
| * | | | | make AbstractAdapter#subquery_for privateTony Miller2015-05-061-13/+13
| | | | | |
* | | | | | copy-edits the docs of dump_schemas [ci skip]Xavier Noria2015-05-061-3/+4
| | | | | |
* | | | | | docs, fix spelling. refs #20040 [ci skip]Yves Senn2015-05-061-4/+4
| | | | | |
* | | | | | add test coverage for `bin/setup`.Yves Senn2015-05-061-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | Make sure this script keeps working and has consistent output.
* | | | | | Merge pull request #20023 from mohnish/patch-1Yves Senn2015-05-062-2/+5
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | Use the built-in rake tasks
| * | | | | Use the built-in rake tasksMohnish Thallavajhula2015-05-041-2/+2
| | | | | | | | | | | | | | | | | | Use the `log:clear` and `tmp:clear` rake tasks in the setup file template
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 19:20:13 +0000