Commit Graph

51155 Commits

Author SHA1 Message Date
Arun Agrawal
145b7ce53c Merge pull request #20079 from ankit8898/aj_all
docs: syncing with the code, adding aj [ci skip]
2015-05-08 21:39:33 +02:00
Ankit Gupta
d9e76bd389 docs: syncing with the code, adding aj [ci skip] 2015-05-08 15:22:28 -04:00
Rafael Mendonça França
654046283a Merge pull request #20078 from robertjlooby/fix_generated_features_methods_docs
change GeneratedFeatureMethods to GeneratedAssociationMethods in docs
2015-05-08 16:12:22 -03:00
Rob Looby
6dab0b28c7 change GeneratedFeatureMethods to GeneratedAssociationMethods in docs
the module name was changed in 8e814a0ac0768816974d2bfd68d33d931592751e
2015-05-08 13:55:20 -05:00
Rafael Mendonça França
fca8a7a7ba Merge pull request #20064 from kddeisz/qu_provider_job_id
Provide provider_job_id to qu adapter.
2015-05-08 15:13:05 -03:00
Rafael Mendonça França
7b975c54d1 Merge pull request #20074 from ankit8898/as_core_ext_req_not
as/core_ext require's not used
2015-05-08 15:10:41 -03:00
Rafael Mendonça França
3d782864a5 Merge pull request #20075 from gouravtiwari/patch-2
Better formatted documents [ci skip]
2015-05-08 15:10:21 -03:00
Gourav Tiwari
333ecdcb56 Better formatted documents [ci skip] 2015-05-08 10:15:36 -07:00
Vijay Dev
9c290fbe7f Merge branch 'master' of github.com:rails/docrails 2015-05-08 16:20:27 +00:00
Ankit Gupta
40fe833493 as/core_ext require's not used 2015-05-08 10:39:30 -04:00
Yves Senn
0b305bfe1a Merge pull request #20072 from vngrs/refactor_active_job_sidekiq_adapter
Refactor sidekiq adapter enqueue and enqueue_at methods
2015-05-08 16:29:04 +02:00
Yves Senn
ce962812cd Merge pull request #20073 from vngrs/remove_test_order_from_activejob_test_helper
Don't need to explicitly set test_order it's :random default
2015-05-08 16:28:18 +02:00
Mehmet Emin İNAÇ
73c70e88d3 Don't need to explicitly set test_order it's :random default 2015-05-08 17:10:28 +03:00
Mehmet Emin İNAÇ
e744cfee65 Refactor sidekiq adapter enqueue and enqueue_at methods 2015-05-08 16:45:04 +03:00
yui-knk
92c0af2174 [ci skip] Add an example to ActionView::Helpers::FormBuilder#label 2015-05-08 21:37:17 +09:00
Yves Senn
0834d60d64 Merge pull request #20068 from mcfiredrill/nodoc-postgresql-rename-column
:nodoc: rename_column in postgresql/schema_statements.rb [ci skip]
2015-05-08 11:45:45 +02:00
Yves Senn
f1da919a05 remove duplicate test.
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.
2015-05-08 11:14:45 +02:00
Tony Miller
afd215da21 :nodoc: rename_column in postgresql/schema_statements.rb
Its already doc'ed in
activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
2015-05-08 16:36:43 +09:00
Zachary Scott
438a138900 Merge pull request #20066 from ankit8898/initialization
added activejob in list [ci skip]
2015-05-07 23:18:00 -07:00
Ankit Gupta
1b62428c13 added activejob in list [ci skip] 2015-05-07 22:24:06 -04:00
Kevin Deisz
221a411fd7 Provide provider_job_id to qu adapter.
Further work to provide provider_job_id for queue adapters.
2015-05-07 19:17:22 -04:00
Rafael Mendonça França
6d951bda36 Merge pull request #20063 from trayo/master
Adds documentaion for the Rails.root and Rails.public_path methods
2015-05-07 19:09:20 -03:00
Rafael Mendonça França
d19d79e6bb Merge pull request #20056 from jvanbaarsen/sidekiq-job-id
Let Sidekiq and Que set provider_job_id
2015-05-07 17:40:26 -03:00
Jeroen van Baarsen
29fcbc2ea0 Make que report back its job_id to provider_job_id
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-05-07 21:59:07 +02:00
Rafael Mendonça França
634c5cbc19 Merge pull request #20062 from gouravtiwari/patch-1
Changed to static value of id in comments [ci skip]
2015-05-07 16:53:17 -03:00
Jeroen van Baarsen
52d131826e Let Sidekiq set provider_job_id
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>
2015-05-07 21:48:50 +02:00
Gourav Tiwari
cf54bbd713 Updated dynamic value of id in comments [ci skip]
In help text for method, dynamic value makes it hard to understand, so replaced with static value matching with example above
2015-05-07 19:45:07 +00:00
Rafael Mendonça França
d84bfaa853 Merge pull request #19910 from kddeisz/delayed_job_provider_job_id
Get provider_job_id from DelayedJob
2015-05-07 16:37:29 -03:00
Rafael Mendonça França
0a5a6c0c36 Merge pull request #20061 from ankit8898/atomfeed-example-update
Example updated [ci skip]
2015-05-07 15:58:56 -03:00
Ankit Gupta
37f4b94190 Example updated [ci skip]
Should be ApplicationController not ApplicationController::Base
2015-05-07 14:53:56 -04:00
Rafael Mendonça França
a9c0115e5b Merge pull request #20060 from ankit8898/typo
Typo fix [ci skip]
2015-05-07 15:26:37 -03:00
Ankit Gupta
e82247aabc Typo fix [ci skip]
Single brackets
2015-05-07 14:24:56 -04:00
Travis Yoder
b0b4b176b0 better docs for Rails.root and Rails.public_path 2015-05-07 10:54:26 -06:00
Yves Senn
64ed04ee78 Merge pull request #20049 from iamvery/patch-1
Amend `next_week` documentation [ci skip]
2015-05-07 15:53:18 +02:00
Jay Hayes
c1025bdff0 Add examples of Date and Time next_week usage
[skip ci]
2015-05-07 08:47:25 -05:00
Yves Senn
d27974d3fb tests, extract helpers to modify global state.
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.
2015-05-07 15:04:49 +02:00
Kasper Timm Hansen
8639795c99 Merge pull request #20055 from davydovanton/doc-fix-typos
[skip ci] Fix typos in actionpack changelog and security guide
2015-05-07 13:54:53 +02:00
Anton Davydov
8a40bf2081 [skip ci] Fix typos in actionpack changelog and security guide 2015-05-07 14:49:34 +03:00
Yves Senn
a6d9d76299 Merge pull request #20051 from ankit8898/railties
removing require object/blank
2015-05-07 08:43:21 +02:00
Zachary Scott
c5ee5cf582 s/snipped/snippet for @senny :trollface: 2015-05-06 22:31:22 -07:00
Zachary Scott
268f13c425 Merge pull request #20040 from ankit8898/route
Docs: Adding a note, snipped for brevity [ci skip]
2015-05-06 22:29:48 -07:00
Ankit Gupta
27238ad1b8 require object/blank not used
the current class is not the blank?, present? as well as other inheriting, the test suite runs
2015-05-06 22:27:42 -04:00
Rafael Mendonça França
2164646eb4 Merge pull request #20047 from mcfiredrill/make-subquery-for-private
make AbstractAdapter#subquery_for private
2015-05-06 13:04:48 -03:00
Tony Miller
ee3f4798e2 make AbstractAdapter#subquery_for private 2015-05-06 23:51:06 +09:00
Xavier Noria
84601e42b8 copy-edits the docs of dump_schemas [ci skip] 2015-05-06 12:32:36 +02:00
Yves Senn
f4da2b7437 docs, fix spelling. refs #20040 [ci skip] 2015-05-06 10:43:33 +02:00
Yves Senn
2d1a7b9c76 add test coverage for bin/setup.
Make sure this script keeps working and has consistent output.
2015-05-06 10:32:38 +02:00
Yves Senn
a64d47ff04 Merge pull request #20023 from mohnish/patch-1
Use the built-in rake tasks
2015-05-06 10:00:01 +02:00
Ankit Gupta
81a87308bb Adding a note, snipped for brevity
sudden ending of form looks incomplete and catches [ci skip]
2015-05-05 18:58:56 -04:00
Santiago Pastorino
6f02160086 Merge pull request #20034 from seanlinsley/list-reserved-works-in-generator-error
List reserved words in generator error
2015-05-05 15:41:20 -03:00