aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | When Array#as_json and Hash#as_json are called without options, theyGodfrey Chan2013-11-222-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | should also call #as_json on the children without options (instead of nil)
* | | | | Merge pull request #12774 from exAspArk/fix_uniqueness_on_relationYves Senn2013-11-223-1/+24
|\ \ \ \ \ | |/ / / / |/| | | | Fix validation on uniqueness
| * | | | Fix validation on uniqueness of empty associationEvgeny Li2013-11-223-1/+24
|/ / / /
* | | | Use a more generic assertion to make sure this tests will be useful.Rafael Mendonça França2013-11-221-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | Since we are using assert_no_match, if we change the code before changing the tests, the tests will still pass and the assertion will become useless
* | | | Merge pull request #13003 from laurocaetano/fix_assertion_for_turbolinksRafael Mendonça França2013-11-221-1/+1
|\ \ \ \ | | | | | | | | | | Fix the assertion for not inclusion of turbolinks on application.js.
| * | | | Fix the assertion for not inclusion of turbolinks on application.js.Lauro Caetano2013-11-221-1/+1
|/ / / / | | | | | | | | | | | | | | | | We were asserting if `//= turbolinks` was not present while the correct is asserting that `//= require turbolinks` is not present.
* | | | Improve changelogsCarlos Antonio da Silva2013-11-224-11/+13
| | | | | | | | | | | | | | | | | | | | Also make Action Mailer changelog format more consistent with the others [ci skip]
* | | | Merge pull request #13000 from arunagw/build-fix-rake-testYves Senn2013-11-211-2/+2
|\ \ \ \ | | | | | | | | | | Build fix for new routing inspector changes
| * | | | Build fix for new routing inspector changesArun Agrawal2013-11-221-2/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | Broken by 6701b4cf41f6f3d9cfc6a93715acbf852d1e468e
* | | | Merge pull request #12996 from shreve/patch-2Guillermo Iguaran2013-11-211-1/+1
|\ \ \ \ | | | | | | | | | | Added a missing close parenthesis to i18n.md
| * | | | Added a missing close parenthesis to i18n.mdJacob Evan Shreve2013-11-211-1/+1
|/ / / /
* | | | Merge pull request #12993 from laurocaetano/skip_turbolinksRafael Mendonça França2013-11-214-4/+21
|\ \ \ \ | | | | | | | | | | Option to skip turbolinks
| * | | | Remove turbolinks when generating a new application based on a templateLauro Caetano2013-11-214-4/+21
|/ / / / | | | | | | | | | | | | | | | | | | | | that skips it. It can be skipped adding `add_gem_entry_filter { |gem| gem.name != "turbolinks" }` to the template.
* | | | Merge pull request #12994 from sbagdat/fix_for_info_titleRafael Mendonça França2013-11-212-1/+3
|\ \ \ \ | | | | | | | | | | Fix for titles of info pages
| * | | | Fix for titles of info pagesSıtkı Bağdat2013-11-222-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Both `rails/info/properties` and `rails/info/routes` have same html title attribute as *Routes*. This commit includes a fix for the titles.
* | | | | Merge pull request #12992 from arunagw/build-fix-routing-inspectorRafael Mendonça França2013-11-211-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Build fix for Routing Inspector
| * | | | | Build fix for Routing InspectorArun Agrawal2013-11-221-2/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Broken by 6701b4cf41f6f3d9cfc6a93715acbf852d1e468e
* | | | | Revert "Merge pull request #12990 from vipulnsward/remove_visualizer_param"Rafael Mendonça França2013-11-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5a19346d2855ecb1c791cdef3af92589566d00db, reversing changes made to d82588ee4756b03025813b3997f4db171ee0fcdc. This argument is being used in the view https://github.com/rails/rails/blob/5a19346d2855ecb1c791cdef3af92589566d00db/actionpack/lib/action_dispatch/journey/visualizer/index.html.erb#L4 It is being set using the binding https://github.com/rails/rails/blob/5a19346d2855ecb1c791cdef3af92589566d00db/actionpack/lib/action_dispatch/journey/gtg/transition_table.rb#L108
* | | | | Merge pull request #12990 from vipulnsward/remove_visualizer_paramRafael Mendonça França2013-11-211-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Remove unused param `title`to `TransitionTable#visualizer`
| * | | | | Remove unused param `title`to `TransitionTable#visualizer`Vipul A M2013-11-221-1/+1
|/ / / / /
* | | | | Merge pull request #12962 from ↵Xavier Noria2013-11-211-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | kamipo/call_initialize_schema_migrations_table_from_migration Use `SchemaStatements#initialize_schema_migrations_table` instead of `ActiveRecord::SchemaMigration.create_table`.
| * | | | | Use `SchemaStatements#initialize_schema_migrations_table` instead of ↵Ryuta Kamizono2013-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | `ActiveRecord::SchemaMigration.create_table`.
* | | | | | unify punctuation in Action Pack changelog. [ci skip]Yves Senn2013-11-211-5/+7
| | | | | |
* | | | | | Merge pull request #12975 from sbagdat/fix-for-rake-routesYves Senn2013-11-214-19/+24
|\ \ \ \ \ \ | | |/ / / / | |/| | | | Fix for routes task
| * | | | | Fix for routes taskSıtkı Bağdat2013-11-214-19/+24
| | | | | | | | | | | | | | | | | | | | | | | | This commit fixes formatting issue for `rake routes` task, when a section is shorter than a header.
* | | | | | doc `travel` and `travel_to` stubs are removed in teardown. [ci skip]Yves Senn2013-11-211-4/+4
| | | | | |
* | | | | | replace custom Time stubbing with `travel` and `travel_to`.Yves Senn2013-11-211-37/+7
| | | | | |
* | | | | | Merge pull request #12970 from prathamesh-sonpatki/issue12885Carlos Antonio da Silva2013-11-211-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add positional information to eval call so that this information will be used in printing correct location where the exception occurred. Closes #12885.
| * | | | | | Add positional information to eval call so that this information willPrathamesh Sonpatki2013-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be used in printing correct location where the exception occurred. Closes #12885 - Without this the location of exception is always the line on which 'eval' is called - But if the exception occurs in a gem outside of Rails, then that location is not printed in stacktrace
* | | | | | | Merge pull request #12986 from budnik/fix-unicode-nbspCarlos Antonio da Silva2013-11-214-9/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | replace U+00A0 with whitespace, Fixes #12985
| * | | | | | | replace U+00A0 with whitespaceDmitriy Budnik2013-11-214-9/+9
|/ / / / / / /
* | | | | | | Merge pull request #12976 from tmm1/faster-blankXavier Noria2013-11-201-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Faster String#blank?
| * | | | | | Expand double-negative in String#blank? regexAman Gupta2013-11-201-1/+1
|/ / / / / /
* / / / / / Fix ActiveRecord::Relation#unscopeJon Leighton2013-11-208-23/+45
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm pretty confused about the addition of this method. The documentation says that it was intended to allow the removal of values from the default scope (in contrast to #except). However it behaves exactly the same as except: https://gist.github.com/jonleighton/7537008 (other than having a slightly enhanced syntax). The removal of the default scope is allowed by 94924dc32baf78f13e289172534c2e71c9c8cade, which was not a change we could make until 4.1 due to the need to deprecate things. However after that change #unscope still gives us nothing that #except doesn't already give us. However there *is* a desire to be able to unscope stuff in a way that persists across merges, which would allow associations to be defined which unscope stuff from the default scope of the associated model. E.g. has_many :comments, -> { unscope where: :trashed } So that's what this change implements. I've also corrected the documentation. I removed the guide references to #except as I think unscope really supercedes #except now. While we're here, there's also a potential desire to be able to write this: has_many :comments, -> { unscoped } However, it doesn't make sense and would not be straightforward to implement. While with #unscope we're specifying exactly what we want to be removed from the relation, with "unscoped" we're just saying that we want it to not have some things which were added earlier on by the default scope. However in the case of an association, we surely don't want *all* conditions to be removed, otherwise the above would just become "SELECT * FROM comments" with no foreign key constraint. To make the above work, we'd have to somehow tag the relation values which get added when evaluating the default scope in order to differentiate them from other relation values. Which is way too much complexity and therefore not worth it when most use cases can be satisfied with unscope. Closes #10643, #11061.
* | | | | swap arguments for some `assert_equal` statements => `expected, actual`Yves Senn2013-11-201-6/+6
| | | | |
* | | | | Merge pull request #12824 from sikachu/ps-testing-time-helperXavier Noria2013-11-204-2/+144
|\ \ \ \ \ | |/ / / / |/| | | | Add `#travel` and `#travel_to` to `ActiveSupport::TestCase`
| * | | | Add `#travel` and `#travel_to` to AS::TestCasePrem Sichanugrist2013-11-204-2/+144
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `ActiveSupport::Testing::TimeHelpers#travel` and `#travel_to`. These methods change current time to the given time or time difference by stubbing `Time.now` and `Date.today` to return the time or date after the difference calculation, or the time or date that got passed into the method respectively. These methods also accept a block, which will return current time back to its original state at the end of the block. Example for `#travel`: Time.now # => 2013-11-09 15:34:49 -05:00 travel 1.day Time.now # => 2013-11-10 15:34:49 -05:00 Date.today # => Sun, 10 Nov 2013 Example for `#travel_to`: Time.now # => 2013-11-09 15:34:49 -05:00 travel_to Time.new(2004, 11, 24, 01, 04, 44) Time.now # => 2004-11-24 01:04:44 -05:00 Date.today # => Wed, 24 Nov 2004 Both of these methods also accept a block, which will return the current time back to its original state at the end of the block: Time.now # => 2013-11-09 15:34:49 -05:00 travel 1.day do User.create.created_at # => Sun, 10 Nov 2013 15:34:49 EST -05:00 end travel_to Time.new(2004, 11, 24, 01, 04, 44) do User.create.created_at # => Wed, 24 Nov 2004 01:04:44 EST -05:00 end Time.now # => 2013-11-09 15:34:49 -05:00 This module is included in `ActiveSupport::TestCase` automatically.
* | | | Merge pull request #12961 from jbaudanza/docRafael Mendonça França2013-11-191-1/+1
|\ \ \ \ | | | | | | | | | | Update caching guide with respect to :namespace
| * | | | Update caching guide with respect to :namespaceJonathan Baudanza2013-11-191-1/+1
|/ / / / | | | | | | | | | | | | Cache::Store does not have a default value for :namespace. If it ever did, I can't find it in the git history.
* | | | _implied_layout_name should be privateRafael Mendonça França2013-11-191-9/+11
| | | |
* | | | Use the right indentationRafael Mendonça França2013-11-191-1/+1
| | | |
* | | | Renderer#_render_template should be privateRafael Mendonça França2013-11-191-7/+7
| | | | | | | | | | | | | | | | Closes #12831
* | | | Merge pull request #12959 from macmartine/partial_renderer_doc_improvementRafael Mendonça França2013-11-191-1/+1
|\ \ \ \ | | | | | | | | | | Improve readability of sentence in partial-renderer docs [ci skip]
| * | | | Improve readability of sentence in partial-renderer docs [ci skip]Mac Martine2013-11-191-1/+1
| | | | |
* | | | | use arel nodes to represent non-string `order_values`.Yves Senn2013-11-194-24/+28
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug when merging relations of different classes. ``` Given: Post.joins(:author).merge(Author.order(name: :desc)).to_sql Before: SELECT "posts".* FROM "posts" INNER JOIN "authors" ON "authors"."id" = "posts"."author_id" ORDER BY "posts"."name" DESC After: SELECT "posts".* FROM "posts" INNER JOIN "authors" ON "authors"."id" = "posts"."author_id" ORDER BY "authors"."name" DESC ```
* | | | Revert "Properly require database tasks so we have access to the raised ↵Rafael Mendonça França2013-11-193-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | constant" This reverts commit fbcd46b1a0d255a34d29caa77bbd31c287446333. This is not needed anymore. See 7280965
* | | | Revert "Explicitly exit with status "1" for create and drop failures"Rafael Mendonça França2013-11-196-51/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 22f80ae57b26907f662b7fd50a7270a6381e527e. See https://github.com/rails/rails/commit/22f80ae57b26907f662b7fd50a7270a6381e527e#commitcomment-4640676 Conflicts: activerecord/CHANGELOG.md
* | | | use arel `master` and update activerecord to depend on arel `5.0.0`.Yves Senn2013-11-192-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This is a follow-up to 3053fee954c1e28b23f7e00921d7b9b3b3867fa5. > The `master` branch should use the `master` branch.
* | | | use `4-0-stable` arel branch to get bundle working again.Yves Senn2013-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this resolves the following error when running `bundle install` ``` ArgumentError: wrong number of arguments (2 for 1) /Users/senny/Projects/rails/.bundle/bundler/gems/arel-454a25f18c95/lib/arel/crud.rb:5:in `compile_update' ``` The build is still broken with lots of: ``` ArgumentError: wrong number of arguments (2 for 1) /Users/senny/Projects/rails/.bundle/bundler/gems/arel-454a25f18c95/lib/arel/crud.rb:5:in `compile_update' ```
* | | | Merge pull request #12949 from akshay-vishnoi/documentationRafael Mendonça França2013-11-191-19/+19
|\ \ \ \ | | | | | | | | | | [ci skip] `apropriate` => `appropriate`, spaces added
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 12:27:39 +0000