aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Removed not needed includes, As record_tag_helper is moved to a gem we are notAnkit Gupta2015-05-101-2/+1
* Merge pull request #20099 from yui-knk/fix/comment_association_cacheAbdelkader Boudih2015-05-101-1/+1
|\
| * [ci skip] Fix comment of `ActiveRecord::Associations#association_instance_get`yui-knk2015-05-111-1/+1
* | Merge pull request #20097 from ankit8898/refac_test_amSantiago Pastorino2015-05-102-2/+0
|\ \
| * | not needed require'sAnkit Gupta2015-05-102-2/+0
| |/
* | Merge pull request #20096 from yui-knk/fix/testing_guideEileen M. Uchitelle2015-05-101-1/+1
|\ \ | |/ |/|
| * [ci skip] Fix purpose of `assert_kind_of`yui-knk2015-05-101-1/+1
|/
* Merge pull request #20094 from vngrs/refactor_railties_commandsRafael Mendonça França2015-05-104-109/+103
|\
| * Refactor railties console and dbconsole commandsMehmet Emin İNAÇ2015-05-104-109/+103
|/
* Merge pull request #20087 from kuldeepaggarwal/fix-engine-guidesYves Senn2015-05-091-2/+2
|\
| * [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]Faruk AYDIN2015-05-091-1/+1
* | Move `TemplateAssertions` to their own fileeileencodes2015-05-092-188/+189
* | 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 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]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]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 docsRob Looby2015-05-081-1/+1
|/ /
* | 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.Kevin Deisz2015-05-074-9/+16
* | | 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 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]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
| * | | 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 methodsMehmet Emin İNAÇ2015-05-081-6/+2
| | |/ / | |/| |
* | | | Merge pull request #20073 from vngrs/remove_test_order_from_activejob_test_he...Yves Senn2015-05-081-2/+0
|\ \ \ \ | |/ / / |/| | |
| * | | 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.rbTony Miller2015-05-081-1/+1
* | | | remove duplicate test.Yves Senn2015-05-081-10/+2
* | | | Merge pull request #20066 from ankit8898/initializationZachary Scott2015-05-071-0/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | 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
|\ \ \
| * | | 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
|\ \ \ \