aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | Accept lambda as child_index option in #fields_for methodKarol Galanciak2015-04-053-1/+26
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #19647 from codeout/association_updateRafael Mendonça França2015-04-062-0/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix a regression introduced by removing unnecessary db call when replacing
| * | | | | | | | Fix a regression introduced by removing unnecessary db call when replacingShintaro Kojima2015-04-042-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When replacing a has_many association with the same one, there is nothing to do with database but a setter method should still return the substituted value for backward compatibility.
* | | | | | | | | Merge pull request #19029 from iainbeeston/skipping-undefined-callbacksRafael Mendonça França2015-04-064-15/+46
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Raise ArgumentError if an unrecognised callback is skipped
| * | | | | | | | | Raise ArgumentError if an unrecognised callback is skippedIain Beeston2015-04-034-15/+46
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At present, if you skip a callback that hasn't been defined, activesupport callbacks silently does nothing. However, it's easy to mistype the name of a callback and mistakenly think that it's being skipped, when it is not. This problem even exists in the current test suite. CallbacksTest::SkipCallbacksTest#test_skip_person attempts to skip callbacks that were never set up. This PR changes `skip_callback` to raise an `ArgumentError` if the specified callback cannot be found.
* | | | | | | | | Merge pull request #19448 from tgxworld/fix_activesupport_callbacks_clash_on_runRafael Mendonça França2015-04-068-33/+24
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix AS::Callbacks raising an error when `:run` callback is defined.
| * | | | | | | | | Revert "Reduce allocations when running AR callbacks."Guo Xiang Tan2015-03-228-33/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 796cab45561fce268aa74e6587cdb9cae3bb243e.
* | | | | | | | | | No need to document drop_table in the PostgreSQLAdapterRafael Mendonça França2015-04-063-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It behaves in the same way that the abstract adapter. [ci skip]
* | | | | | | | | | Merge pull request #19671 from nishantmodak/patch-1Rafael Mendonça França2015-04-061-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix URL rails-framework-hooks
| * | | | | | | | | | Fix URL rails-framework-hooksNishant Modak2015-04-071-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #19668 from y-yagi/notes_default_dirRafael Mendonça França2015-04-061-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | correct the directory which rake notes look by default [ci skip]
| * | | | | | | | | | correct the directory which rake notes look by default [ci skip]yuuji.yaginuma2015-04-061-1/+1
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #19670 from vngrs/misspell_of_existKasper Timm Hansen2015-04-062-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | correct spell of exist [ci skip]
| * | | | | | | | | change the explanation of :if_exists option [ci skip]Mehmet Emin İNAÇ2015-04-062-2/+2
|/ / / / / / / / /
* | | | | | | | | Merge pull request #19667 from vngrs/drop_table_docSantiago Pastorino2015-04-062-0/+19
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | drop_table method documentation for mysql and postgresql adapters [ci skip]
| * | | | | | | | | drop_table method documentation for mysql and postgresql adapters [ci skip]Mehmet Emin İNAÇ2015-04-062-0/+19
| | | | | | | | | |
* | | | | | | | | | Merge pull request #19666 from mikej/masterSantiago Pastorino2015-04-061-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | fix missing "if" in API docs for ActionController::Parameters#permit
| * | | | | | | | | | fix missing "if" in API docs for ActionController::Parameters#permitMichael Josephson2015-04-061-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Fix ActionPack tests after changes to missing template loggereileencodes2015-04-062-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After merging #19377 ActionPack tests were missing a require for `ActiveSupport::LogSubscriber::TestHelper` and change didn't take into account that logger could be nil. Added the require and only log to info if logger exists. This wasn't caught earlier because these tests only run after a merge.
* | | | | | | | | | Merge pull request #19665 from eileencodes/fix-parse_query-method-signatureEileen M. Uchitelle2015-04-061-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | Fix method signature of `parse_query` to match rack
| * | | | | | | | | Fix method signature of `parse_query` to match rackeileencodes2015-04-061-1/+1
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recently rack was changed to have a second argument on the `parse_query` method (in rack/rack#781). Rails relies on this and it's `parse_query` method was complaining about missing the second argument. I changed the arguments to `*` so we don't have this issue in the future.
* | | | | | | | | Merge pull request #19377 from sb8244/issue-19036David Heinemeier Hansson2015-04-064-8/+31
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | when a template is missing for the default render, do head no_content instead
| * | | | | | | | | head no_content when there is no template or action performedStephen Bussey2015-04-054-8/+31
| |/ / / / / / / /
* | | | | | | | | Merge pull request #19652 from vngrs/pluralize_foreign_key_table_name_bugYves Senn2015-04-064-2/+34
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use singular table name if pluralize_table_names is setted as false whil...
| * | | | | | | | | use singular table name if pluralize_table_names is setted as false while ↵Mehmet Emin İNAÇ2015-04-063-2/+27
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | creating foreign key test case for use singular table name if pluralize_table_names is setted as false while creating foreign key refactor references foreign key addition tests use singular table name while removing foreign key merge foreign key singular table name methods remove unnecessary drop table from test
* | | | | | | | | Merge pull request #19662 from yui-knk/fix/bindMatthew Draper2015-04-061-47/+0
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | [ci skip] Remove Extensions to `Proc` section
| * | | | | | | | [ci skip] Remove Extensions to `Proc` chapter sectionyui-knk2015-04-061-47/+0
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | `Proc#bind` is removed with 4.1 release
* | | | | | | | Merge pull request #19657 from smadeja/guides-updateYves Senn2015-04-051-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Update command_tasks source code
| * | | | | | | | Update command_tasks source codeSzymon Madeja2015-04-051-1/+1
| | | | | | | | |
* | | | | | | | | fix typo in deprecation message. [Robin Dupret]Yves Senn2015-04-051-1/+1
|/ / / / / / / /
* | | | | | | | Fix a few typos [ci skip]Robin Dupret2015-04-053-12/+14
| | | | | | | |
* | | | | | | | Merge pull request #19644 from y-yagi/auto_discovery_link_tag_docYves Senn2015-04-052-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | correct output of auto_discovery_link_tag [ci skip]
| * | | | | | | | correct output of auto_discovery_link_tag [ci skip]yuuji.yaginuma2015-04-042-2/+2
| | | | | | | | |
* | | | | | | | | Merge pull request #19650 from vngrs/fix_for_i18n_documentationArthur Nogueira Neves2015-04-051-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | change REQUEST_URI to PATH_INFO
| * | | | | | | | | change REQUEST_URI to PATH_INFOMehmet Emin İNAÇ2015-04-041-1/+1
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | request.env['REQUEST_URI'] returns full URI of the resource request.env['PATH_INFO'] returns only path of the resource
* | | | | | | | | Merge pull request #19649 from aprescott/allow-array-defaultsMatthew Draper2015-04-053-1/+12
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow an array to be a default translation value.
| * | | | | | | | | Allow an array to be a default translation value.Adam Prescott2015-04-043-1/+14
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.2.1 introduced a change to the way `translate`/`t` works with an option of `default: [[]]`. In 4.2.0, this would give a default value of `[]`, but in 4.2.1, it leads to a missing translation. `default: [[]]` is again allowed for cases where a default of `[]` is needed. This addresses GitHub issue 19640.
* | | | / / / / / Don't invoke sql_runtime if logger is not set to infoeileencodes2015-04-042-2/+3
| |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `sql_runtime` was getting invoked even when the logger was set to fatal. This ensures that does not happen by checking that the logger is set to info level before logging the view runtime. This reduces the number of times `sql_runtime` is called for integration tests with a fatal logger from 6 to 2.
* | | | | | | | Merge pull request #19636 from davydovanton/docs-update-link-to-attributesKasper Timm Hansen2015-04-041-4/+3
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | [skip ci] Update information about #link_to attributes
| * | | | | | | [skip ci] Update information about #link_to attributesAnton Davydov2015-04-041-4/+3
| |/ / / / / /
* | | | | | | Merge pull request #19429 from mxhold/print_bundle_install_output_line_by_lineMatthew Draper2015-04-032-6/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Print `bundle install` output in `rails new` as soon as it's available
| * | | | | | | Print `bundle install` output in `rails new` as soon as it's availableMax Holder2015-03-282-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, running `rails new` would not print any of the output from `bundle install` until all the gems had finished installing. This made it look like the generator was hanging at the `bundle install` step. This commit switches to using `system` so that the bundle command can output as it needs to. This has the added benefit of including output bundler produces on standard error, which the previous code ignored since backticks only capture standard out. This is not a big deal right now since bundler does not currently print errors to standard error, but that may change in the future (see: bundler/bundler/issues/3353).
* | | | | | | | Merge pull request #19625 from strzibny/fix-test-rails-git-layoutMatthew Draper2015-04-031-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Do not depend on Rails git repository layout in ActiveSupport tests
| * | | | | | | | Do not depend on Rails git repository layout in ActiveSupport testsJosef Stribny2015-04-021-2/+2
| | | | | | | | |
* | | | | | | | | Merge pull request #19627 from koenpunt/patch-1Matthew Draper2015-04-031-4/+0
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | remove duplicates
| * | | | | | | | remove duplicatesKoen Punt2015-04-031-4/+0
|/ / / / / / / /
* | | | | | | | Merge pull request #19616 from brainopia/speed_up_gsubJeremy Kemper2015-04-0111-14/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Prefer string patterns for gsub
| * | | | | | | | Freeze static arguments for gsubbrainopia2015-04-0211-14/+14
| | | | | | | | |
| * | | | | | | | Prefer string patterns for gsubbrainopia2015-04-0211-13/+13
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/ruby/ruby/pull/579 - there is a new optimization since ruby 2.2 Previously regexp patterns were faster (since a string was converted to regexp underneath anyway). But now string patterns are faster and better reflect the purpose. Benchmark.ips do |bm| bm.report('regexp') { 'this is ::a random string'.gsub(/::/, '/') } bm.report('string') { 'this is ::a random string'.gsub('::', '/') } bm.compare! end # string: 753724.4 i/s # regexp: 501443.1 i/s - 1.50x slower
* | | | | | | | Remove old mri platform entries from our GemfileCarlos Antonio da Silva2015-04-012-11/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we now only support Ruby 2.2+, we can safely remove the old mri entries from the Gemfile. This also allows us not to lock to a specific bundler version, since :mri_22 was defined only on 1.7.11. Closes #19611.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-11 11:04:47 +0000