aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | | Merge pull request #20034 from ↵Santiago Pastorino2015-05-054-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | seanlinsley/list-reserved-works-in-generator-error List reserved words in generator error
| * | | | list reserved words in generator errorSean Linsley2015-05-054-4/+4
|/ / / /
* | | | Merge pull request #20032 from ankit8898/guideRafael Mendonça França2015-05-051-1/+1
|\ \ \ \ | | | | | | | | | | Documentation: Using the real C and R def of Crud [ci skip]
| * | | | Using the real C and R def of Crud [ci skip]Ankit gupta2015-05-051-1/+1
| | | | |
* | | | | Merge pull request #19756 from georgemillo/docsRobin Dupret2015-05-051-17/+26
|\ \ \ \ \ | |/ / / / |/| | | | fixing English in Rails::Engine docs
| * | | | fixing English in Rails::Engine docsGeorge Millo2015-04-231-17/+26
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge pull request #20031 from trayo/masterZachary Scott2015-05-051-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fixes some words missing from the contributing guide [ci skip]
| * | | | | fixes some words missingTravis Yoder2015-05-041-1/+1
| | | | | |
* | | | | | Merge pull request #20030 from ankit8898/grammar_corrRafael Mendonça França2015-05-051-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Tiny grammar correction in documentation [ci skip]
| * | | | | Tiny grammar correction in documentation [ci skip]Ankit gupta2015-05-051-1/+1
|/ / / / /
* | | | | use the right assertions.Yves Senn2015-05-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prompted by: https://github.com/rails/rails/commit/e38dd7bfa4360e241eadf0cf44abdf86ea33a393#commitcomment-11011496 /cc @kuldeepaggarwal
* | | | | Merge pull request #20025 from kamipo/dont_use_exec_query_for_performanceMatthew Draper2015-05-052-22/+17
|\ \ \ \ \ | | | | | | | | | | | | Use `select_value` for avoid `ActiveRecord::Result` instance creating
| * | | | | Use `select_value` for avoid `ActiveRecord::Result` instance creatingRyuta Kamizono2015-05-052-22/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `exec_query` create `ActiveRecord::Result` instance. It is better to use `select_value` instead of `exec_query` for performance.
* | | | | | Merge pull request #20024 from ↵Matthew Draper2015-05-051-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | kamipo/use_select_rows_instead_of_select_one_in_select_values Use `select_rows` instead of `select_one` in `select_value`
| * | | | | | Use `select_rows` instead of `select_one` in `select_value`Ryuta Kamizono2015-05-051-2/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | `select_one` create `ActiveRecord::Result` instance. It is better to use `select_rows` instead of `select_one` for performance.
* | | | | | Merge pull request #20019 from imanel/remove_rescue_formatMatthew Draper2015-05-053-16/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove :rescue_format option for translate helper
| * | | | | | Remove :rescue_format option for translate helper since it's no longer ↵Bernard Potocki2015-05-043-16/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | supported by I18n.
* | | | | | | Merge pull request #19868 from createdbypete/guides-postgres-uuid-pgcryptoYves Senn2015-05-051-6/+9
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Provide mention of pgcrypto extension for Postgres UUID support [ci skip]
| * | | | | | Provide mention of pgcrypto extension for uuidsPeter Rhoades2015-05-041-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From the Postgresql 9.4+ docs > If you only need randomly-generated (version 4) UUIDs, consider using the gen_random_uuid() function from the pgcrypto module instead. [ci skip]
* | | | | | | Fix constant in void context warningsAndrew White2015-05-051-2/+2
| | | | | | |
* | | | | | | Fix URI.escape is obsolete warningsAndrew White2015-05-051-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Put the assertion arguments in the right orderMatthew Draper2015-05-051-1/+1
| |/ / / / |/| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-17 13:51:39 +0000