aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Speed up JRuby tests by improving its startup timePeter Suschlik2014-08-251-7/+10
| | | | | | | | | Emulate `jruby --dev` which improves JRuby's startup time. See https://github.com/jruby/jruby/wiki/Improving-startup-time#use-the---dev-flag Follow @headius' idea and give Java more memory to reduce GC time.
* Merge pull request #16681 from seuros/masterJeremy Kemper2014-08-241-0/+1
|\ | | | | [ActiveJob] Add activesupport as dependency [ci skip]
| * [ActiveJob] Add activesupport as dependency [ci skip]Abdelkader Boudih2014-08-241-0/+1
| |
* | Merge pull request #16639 from agrobbin/input-placeholder-i18nJeremy Kemper2014-08-245-0/+231
|\ \ | | | | | | Add I18n support for `:placeholder` HTML option is passed to form fields
| * | just use the placeholder tag value if it is passed as a StringAlex Robbin2014-08-222-5/+22
| | |
| * | add I18n support for `:placeholder` HTML option is passed to form fieldsAlex Robbin2014-08-225-0/+214
| | |
* | | Merge pull request #16662 from robin850/duration-instance-ofJeremy Kemper2014-08-243-9/+14
|\ \ \ | | | | | | | | Fix `ActiveSupport::Duration#instance_of?` to behave like `#is_a?`
| * | | Skip #eql? tests on Rubinius for AS::DurationRobin Dupret2014-08-241-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Rubinius is relying on #instance_of? for its definition of #eql? (http://git.io/MtmbbA) but ActiveSupport::Duration should behave like is_a? it returns true with `Fixnum`. Thus, for the moment, the last assertion is failing so we have to skip this test.
| * | | Follow-up to #16560Robin Dupret2014-08-243-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For the sake of backward-compatibility, we need to make #instance_of? return true for Fixnum. On the other hand, the method should still give true for ActiveSupport::Duration itself which was not the case before.
* | | | Merge pull request #16616 from schneems/schneems/jeremy-commentsJeremy Kemper2014-08-247-12/+58
|\ \ \ \ | | | | | | | | | | Address comments on Gzip implementation
| * | | | Address comments on Gzip implementationschneems2014-08-247-12/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - don't mutate PATH_INFO in env, test - test fallback content type matches Rack::File - change assertion style - make HTTP_ACCEPT_ENCODING comparison case insensitive - return gzip path from method instead of true/false so we don't have to assume later - don't allocate un-needed hash. Original comments: https://github.com/rails/rails/commit/ cfaaacd9763642e91761de54c90669a88d772e5a#commitcomment-7468728 cc @jeremy
* | | | | Merge pull request #16680 from huoxito/update-dependenciesRobin Dupret2014-08-241-2/+0
|\ \ \ \ \ | | | | | | | | | | | | treetop is no longer a mail (rails) dependency [ci skip]
| * | | | | treetop is no longer a mail (rails) dependencyWashington Luiz2014-08-241-2/+0
|/ / / / / | | | | | | | | | | | | | | | see https://github.com/mikel/mail/commit/2da7c7985c221272f6451b27ab8b41e84e0a6804
* | | | | Whoops, duplicated word [ci skip]Robin Dupret2014-08-241-1/+1
| | | | |
* | | | | Some tweaks to the development set-up guideRobin Dupret2014-08-241-43/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove the libxml2 and libxslt part ; Nokogiri ships now with these libraries bundled. * Add the missing installation instructions for either Arch Linux, FreeBSD or Mac OS X. * Use the new `pkg install` syntax over `pkg_add -r` for FreeBSD 10+ users. * Point to the up-to-date version of PostgreSQL as for the BSD port. * Make the platform installation instructions order consistent throughout the guide. * Remove useless duplicated links to Homebrew's home. [ci skip]
* | | | | Fix a few typos [ci skip]Robin Dupret2014-08-242-2/+2
| | | | |
* | | | | Merge pull request #16673 from y-yagi/update_statistics_rakeMatthew Draper2014-08-251-1/+2
|\ \ \ \ \ | | | | | | | | | | | | show stats for app/jobs
| * | | | | show stats for app/jobsyuuji.yaginuma2014-08-241-1/+2
| | | | | |
* | | | | | Merge pull request #16675 from tomkadwill/has_many_documenting_extension_paramSantiago Pastorino2014-08-241-0/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ci skip] Added documentation for has_many extension parameter
| * | | | | | [ci skip] Added documentation for has_many extension parameterTom Kadwill2014-08-241-0/+14
| | | | | | |
* | | | | | | Merge pull request #16676 from tgxworld/web_console_release_note_fixesMatthew Draper2014-08-251-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Grammer and spelling pass on web console release note. [CI SKIP]
| * | | | | | | Grammer and spelling pass on web console release note. [CI SKIP]Guo Xiang Tan2014-08-251-4/+4
|/ / / / / / /
* | | | | | | Merge pull request #16674 from gsamokovarov/describe-web-consoleGuillermo Iguaran2014-08-241-4/+14
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Describe web-console in the release notes
| * | | | | | Describe web-console in the release notes [ci skip]Genadi Samokovarov2014-08-241-4/+14
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | I put a more up-to-date description of Web Console in the release notes. I'm not really happy with the language, so if you guys can help me with that I'll be grateful :)
* | | | | | Merge pull request #16671 from cristianbica/aj-raise-serialization-errorMatthew Draper2014-08-252-5/+16
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Raise ActiveJob::SerializationError when cannot serialize job arguments
| * | | | | Raise ActiveJob::SerializationError when cannot serialize job argumentsCristian Bica2014-08-242-5/+16
|/ / / / /
* | | | | Merge pull request #16667 from JuanitoFatas/patch/anchor-generationGodfrey Chan2014-08-241-1/+6
|\ \ \ \ \ | |_|_|/ / |/| | | | Fix guide anchor generation logic.
| * | | | Fix guide anchor generation logic.Juanito Fatas2014-08-241-1/+6
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | This could use in any translation because it's not limited to `[^a-z0-9]`. Verify after this change, all guides still have same anchors. [Robin Dupret & Juanito Fatas]
* | | | CHANGELOG & improvements to #16649Godfrey Chan2014-08-232-2/+9
| | | | | | | | | | | | | | | | | | | | * Require either FIRST or LAST qualifier for "NULLS ..." * Require whitespace before "NULLS ..."
* | | | Merge pull request #16649 from Agis-/pg-columns-for-distinctGodfrey Chan2014-08-232-1/+10
|\ \ \ \ | |/ / / |/| | | | | | | Fix postgresql adapter #columns_for_distinct trimming whitespace it shouldn't
| * | | Don't trim excess whitespace in pg #columns_for_distinctAgis-2014-08-242-1/+10
|/ / / | | | | | | | | | Fixes #16623 introduced by https://github.com/rails/rails/commit/3d5a2019bcccc6fb01bee4811ca669f4383edb51
* | | Merge pull request #16659 from y-yagi/patch-4Vijay Dev2014-08-231-1/+1
|\ \ \ | | | | | | | | Fix example code in Active Job guide [ci skip]
| * | | Fix example code in Active Job guide [ci skip]yuuji.yaginuma2014-08-231-1/+1
|/ / /
* | | Merge pull request #16655 from brocktimus/20140823_doco_changeZachary Scott2014-08-231-1/+1
|\ \ \ | | | | | | | | Correct AR::RecordNotFound in AJ guide rescue example [ci skip]
| * | | Properly referencing AR::RecordNotFound in AJ guide rescuing exampleBrock Trappitt2014-08-231-1/+1
| | | |
* | | | Merge pull request #16650 from zzak/fix-precision-number_to_rounded_converterZachary Scott2014-08-221-1/+1
|\ \ \ \ | | | | | | | | | | Use zero-padding for number_to_rounded_converter
| * | | | Use zero-padding for number_to_rounded_converterZachary Scott2014-08-221-1/+1
| | | | |
* | | | | Merge pull request #16647 from tjschuck/form_for_doc_optionsRafael Mendonça França2014-08-221-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Documentation update for form_for options
| * | | | | Remove erroneous form_tag option docsT.J. Schuck2014-08-221-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is true of the first param (url_for_options), not of the second options param which is being documented here. [ci skip]
| * | | | | Clarify that unknown keys will become HTML attrsT.J. Schuck2014-08-221-0/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Docs for all the other form tag helpers in this file already clarify this. [ci skip]
* | | | | Merge pull request #16602 from thetron/active_job_que_enqueue_at_supportRafael Mendonça França2014-08-223-1/+12
|\ \ \ \ \ | | | | | | | | | | | | Added enqueue_at support for QueAdapter in ActiveJob
| * | | | | Added enqueue_at support for QueAdapter in ActiveJobNicholas Bruning2014-08-213-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added inline job runner for Que in test/support * Updated QueAdapter to support enqueue_at
* | | | | | Merge pull request #16648 from seuros/masterRafael Mendonça França2014-08-223-2/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ActiveJob] Add hook for test_framework
| * | | | | | [ActiveJob] Add hook for test_framework and test templatesAbdelkader Boudih2014-08-223-2/+26
|/ / / / / /
* | | | | | Merge pull request #16598 from seuros/masterMatthew Draper2014-08-231-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ActionMailer] require activejob railtie
| * | | | | | [ActionMailer] require activejob railtieAbdelkader Boudih2014-08-221-0/+1
| | | | | | |
* | | | | | | Merge pull request #15932 from joseluistorres/issue-11957-uuidsRafael Mendonça França2014-08-223-1/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | adding the exception RecordNotFound to UUID find #11957
| * | | | | | | adding the exception RecordNotFound to UUID findJoseLuis Torres2014-08-213-1/+17
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #16645 from sgrif/sg-perf-regressionRafael Mendonça França2014-08-221-8/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Don't calculate in-place changes twice
| * | | | | | | Don't calculate in-place changes twiceSean Griffin2014-08-221-8/+0
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that `changed_attributes` includes in place changes, we don't need to override these methods in Active Record. Partially fixes the performance regression caused by #16189
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 19:26:21 +0000