aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | Merge pull request #19610 from yui-knk/fix/suppressAbdelkader Boudih2015-04-011-1/+1
|\ \ \ | | | | | | | | [ci skip] Replace `reraised` with `not captured`
| * | | [ci skip] Replace `reraised` with `not captured`yui-knk2015-04-021-1/+1
| | | |
* | | | Merge pull request #19609 from davydovanton/docs-add-target-blank-infoAbdelkader Boudih2015-04-011-0/+6
|\ \ \ \ | |/ / / |/| | | [skip ci] Add information about #link_to target option
| * | | [skip ci] Add information about #link_to target optionAnton Davydov2015-04-011-0/+6
|/ / /
* | | Merge pull request #19607 from rousisk/docs_sql_execute_correctionRafael Mendonça França2015-04-011-1/+1
|\ \ \ | | | | | | | | [ci skip] fix guides example on arbitrary SQL execution
| * | | [ci skip] fix guides example on arbitrary SQL executionKonstantinos Rousis2015-04-011-1/+1
|/ / /
* | | Merge pull request #19606 from yui-knk/fix/query_mdRafael Mendonça França2015-04-011-1/+1
|\ \ \ | | | | | | | | [ci skip] Fix `:having` option with `having` method
| * | | [ci skip] Fix `:having` option with `having` methodyui-knk2015-04-011-1/+1
|/ / /
* | | Merge pull request #19605 from 1337807/patch-1Rafael Mendonça França2015-04-011-0/+12
|\ \ \ | | | | | | | | | | | | Update routing.md
| * | | Update routing.mdJonan Scheffler2015-04-011-0/+12
|/ / / | | | | | | | | | | | | | | | This adds instructions for routing to rack applications with mount instead of match. I just spent an unreasonable amount of time staring at this, hopefully the next person will save some time. It's possible that the docs should simply advise people to use mount and leave out the match method but I don't know enough about the differences in the two approaches to assert that definitively.
* | | Merge pull request #19604 from aaronjensen/speed-up-time-coercionRafael Mendonça França2015-04-011-2/+4
|\ \ \ | | | | | | | | Only coerce time when comparing if necessary
| * | | Only coerce time when comparing if necessaryAaron Jensen2015-03-311-2/+4
|/ / / | | | | | | | | | | | | | | | In dev, ActiveSupport::FileUpdateChecker#max_mtime triggers many time comparisons. Time#to_time is quite a bit slower than not doing it, so we should avoid it if possible.
* | | Merge pull request #19586 from mechanicles/fix-eager-loading-for-find-methodsRafael Mendonça França2015-03-312-1/+18
|\ \ \ | | | | | | | | Fix eager loading association using default_scope for finder methods.
| * | | Fix eager loading association using default_scope for finder methods.Santosh Wadghule2015-03-312-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | - Eager loading was not working for the default_scope (class method) for 'find' & 'find_by' methods. - Fixed these by adding a new check 'respond_to?(:default_scope)'.
* | | | Merge pull request #19603 from eliotsykes/remove-considerations-sectionRafael Mendonça França2015-03-311-9/+0
|\ \ \ \ | | | | | | | | | | Remove unused subdir deployment considerations section [ci skip]
| * | | | Remove unused subdir deployment considerations section [ci skip]Eliot Sykes2015-03-311-9/+0
|/ / / /
* | | | Make method as nodoc since we are already docummenting at AbstractAdapterRafael Mendonça França2015-03-311-1/+1
| | | |
* | | | Merge pull request #19599 from y-yagi/application_job_templateCarlos Antonio da Silva2015-03-311-1/+0
|\ \ \ \ | | | | | | | | | | remove extra newline from ApplicationJob template
| * | | | remove extra newline from ApplicationJob templateyuuji.yaginuma2015-03-311-1/+0
|/ / / /
* | | | Merge pull request #19596 from yui-knk/fix/comment_alias_attributeArthur Nogueira Neves2015-03-311-1/+1
|\ \ \ \ | | | | | | | | | | [ci skip] Replace `query methods` with `a predicate`
| * | | | [ci skip] Replace `query methods` with `a predicate`yui-knk2015-03-311-1/+1
|/ / / /
* | | | Merge pull request #19595 from claudiob/fix-docs-set-callbackYves Senn2015-03-311-4/+6
|\ \ \ \ | | | | | | | | | | Fix doc: set_callback also accepts an array of if:
| * | | | Fix doc: set_callback also accepts an array of if:claudiob2015-03-311-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Active Record calls `set_callback` inside `after_commit`, [these lines of code](https://github.com/rails/rails/blob/master/activerecord/lib/active_record/transactions.rb#L276) pass an **array** of methods as the `:if` condition: ```ruby options[:if] = Array(options[:if]) options[:if] << "transaction_include_any_action?(#{fire_on})" ``` That made me realize that anyone could pass an **array** of `:if` and `:unless` conditions to `set_callback`, since Active Support transforms these conditions into an array anyways in [these lines of code](https://github.com/rails/rails/blob/master/activesupport/lib/active_support/callbacks.rb#L365): ```ruby @if = Array(options[:if]) @unless = Array(options[:unless]) ``` Long story short, this commit updates the documentation of the `set_callback` method to explain that arrays are also accepted. It also replaces +false+ and +true+ with false and true, since any _falsey_ or _truthy_ value will work. [ci skip]
* | | | | Merge pull request #19523 from kuldeepaggarwal/fix-table-name-conflictYves Senn2015-03-312-2/+4
|\ \ \ \ \ | |/ / / / |/| | | | rename `widgets` table to `new_widgets`
| * | | | use Model.reset_column_information to clear table cache connection wide.Kuldeep Aggarwal2015-03-312-2/+4
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `widgets` table is being created in `primary_keys_test.rb` for PostgreSQLAdapter, MysqlAdapter, Mysql2Adapter and it makes test to fail earlier. Before: `bundle exec rake mysql2:test` ``` Finished in 127.287669s, 35.5258 runs/s, 97.8885 assertions/s. 1) Error: PersistenceTest::SaveTest#test_save_touch_false: ActiveModel::UnknownAttributeError: unknown attribute 'name' for #<Class:0x0000000a7d6ef0>. /home/kd/projects/kd-rails/activerecord/lib/active_record/attribute_assignment.rb:36:in `rescue in _assign_attribute' /home/kd/projects/kd-rails/activerecord/lib/active_record/attribute_assignment.rb:34:in `_assign_attribute' /home/kd/projects/kd-rails/activemodel/lib/active_model/attribute_assignment.rb:40:in `block in _assign_attributes' /home/kd/projects/kd-rails/activemodel/lib/active_model/attribute_assignment.rb:39:in `each' /home/kd/projects/kd-rails/activemodel/lib/active_model/attribute_assignment.rb:39:in `_assign_attributes' /home/kd/projects/kd-rails/activerecord/lib/active_record/attribute_assignment.rb:26:in `_assign_attributes' /home/kd/projects/kd-rails/activemodel/lib/active_model/attribute_assignment.rb:33:in `assign_attributes' /home/kd/projects/kd-rails/activerecord/lib/active_record/core.rb:293:in `initialize' /home/kd/projects/kd-rails/activerecord/lib/active_record/inheritance.rb:61:in `new' /home/kd/projects/kd-rails/activerecord/lib/active_record/inheritance.rb:61:in `new' /home/kd/projects/kd-rails/activerecord/lib/active_record/persistence.rb:50:in `create!' /home/kd/projects/kd-rails/activerecord/test/cases/persistence_test.rb:913:in `test_save_touch_false' 4522 runs, 12460 assertions, 0 failures, 1 errors, 4 skips ``` After: `bundle exec rake mysql2:test` ``` Finished in 135.785086s, 33.3026 runs/s, 91.7774 assertions/s. 4522 runs, 12462 assertions, 0 failures, 0 errors, 4 skips ```
* | | | Merge pull request #19594 from radar/require-module-delegationGuillermo Iguaran2015-03-301-0/+1
|\ \ \ \ | | | | | | | | | | Require Module#delegate core ext in ActiveModel::Naming
| * | | | Require Module#delegate core ext in ActiveModel::NamingRyan Bigg2015-03-311-0/+1
| | | | |
* | | | | Merge pull request #19592 from adimitri/activerecord-find-ambiguityRafael Mendonça França2015-03-301-3/+1
|\ \ \ \ \ | | | | | | | | | | | | Combine complementary AR #find doc lines
| * | | | | [ci skip] Combine complementary AR #find doc linesAlexander Dimitriyadi2015-03-301-3/+1
|/ / / / /
* | | | | Require the extensions to tests pass in isolationRafael Mendonça França2015-03-301-0/+1
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 11:08:06 +0000