aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #17674 from recursive-madman/activerecord-error-improvementRafael Mendonça França2014-11-263-4/+25
|\ | | | | Add #record attribute to RecordNotFound and RecordDestroyed exceptions.
| * Add #record attribute to RecordNotFound and RecordDestroyed exceptions.Recursive Madman2014-11-263-4/+25
| | | | | | | | This allows these exceptions to be handled generically in conjunction with RecordInvalid.
* | Merge pull request #17782 from cheba/engine-root-masterRafael Mendonça França2014-11-261-1/+1
|\ \ | | | | | | Use absolute_path of caller_locations to infer engine root
| * | Use absolute_path of caller_locations to infer engine rootAlexander Mankuta2014-11-261-1/+1
| | | | | | | | | | | | | | | According to documentation `path` only returns file names. On MRI it's not the case but it's likely a bug in MRI.
* | | Merge pull request #17781 from jonatack/patch-8Rafael Mendonça França2014-11-261-38/+40
|\ \ \ | | | | | | | | Active Record change log pass [skip ci]
| * | | Active Record change log pass [skip ci]Jon Atack2014-11-261-38/+40
| |/ /
* | | Merge pull request #17785 from jipumarino/dbconsole-for-sqlserverRafael Mendonça França2014-11-261-0/+15
|\ \ \ | | | | | | | | Provide support for SQL Server connections with dbconsole using sqsh
| * | | Provide support for SQL Server connections with dbconsole using sqshJuan Ignacio Pumarino2014-11-261-0/+15
|/ / /
* | | Merge pull request #17784 from bruno-/refactor-nested-ifsRafael Mendonça França2014-11-261-5/+3
|\ \ \ | |/ / |/| | Refactor nested if
| * | Refactor nested ifBruno Sutic2014-11-261-5/+3
|/ /
* | Merge pull request #17780 from arcz/patch-1José Valim2014-11-261-1/+0
|\ \ | | | | | | Remove extra empty line
| * | Remove extra empty lineArtur Cygan2014-11-261-1/+0
|/ /
* | :scissors:Rafael Mendonça França2014-11-261-1/+1
| |
* | Merge pull request #17779 from dilpreet92/server_locationRafael Mendonça França2014-11-261-2/+2
|\ \ | | | | | | | | | Getting the location of the server
| * | getting the location of the serverdilpreet922014-11-261-2/+2
|/ /
* | Clarify where result goes, and supported formats of generate task.Zachary Scott2014-11-251-1/+3
| | | | | | | | [ci skip]
* | Use jquery-rails 4.0.0Rafael Mendonça França2014-11-252-9/+3
| |
* | Merge pull request #17773 from gsamokovarov/mention-web-console-2.0-rc1Sean Griffin2014-11-252-2/+2
|\ \ | | | | | | Use web_console 2.0 for 4.2.0.rc1 release
| * | Use web_console 2.0 for 4.2.0.rc1 releaseGenadi Samokovarov2014-11-262-2/+2
| | | | | | | | | | | | | | | This one replaces the notable web-console mentions in guide and the default Gemfile.
* | | Merge pull request #17728 from jcutrell/jcutrell/docs-to_session_value-for-prRafael Mendonça França2014-11-251-3/+6
|\ \ \ | | | | | | | | Adding simple docs for ActionDispatch::Flash::FlashHash#to_session_value
| * | | adding nodoc to private methodsJonathan Cutrell2014-11-231-2/+2
| | | |
| * | | Adding simple docs for ActionDispatch::Flash::FlashHash#to_session_valueJonathan Cutrell2014-11-231-1/+4
| | | |
* | | | Fix warning in AV testsSean Griffin2014-11-251-2/+4
| | | | | | | | | | | | | | | | Originally caused by #17771
* | | | Merge branch 'derekprior-dp-add-foreign-keys-with-generators'Rafael Mendonça França2014-11-255-1/+60
|\ \ \ \ | | | | | | | | | | | | | | | Closes #17759
| * | | | Generators add foreign keys on referencesDerek Prior2014-11-255-1/+60
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you run a generator such as: ``` rails generate model accounts supplier:references ``` The resulting migration will now add the corresponding foreign key constraint unless the reference was specified to be polymorphic.
* | | | Fix syntax error :bomb:Rafael Mendonça França2014-11-251-2/+2
| | | |
* | | | Merge pull request #17697 from sgrif/sg-remove-is-a-check-when-ignoring-tablesSean Griffin2014-11-252-16/+1
|\ \ \ \ | | | | | | | | | | Remove is_a? check when ignoring tables
| * | | | Remove is_a? check when ignoring tablesSean Griffin2014-11-202-16/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Technically changes the API, as it will allow any object which responds to `===`. Personally, I think this is more flexible.
* | | | | Merge pull request #17771 from agis-/issue-17373Sean Griffin2014-11-252-2/+9
|\ \ \ \ \ | |_|_|/ / |/| | | | Local vars should exist in partials for falsy `:object:` values too
| * | | | Local vars should exist in partials for falsy `:object:` values tooAgis-2014-11-252-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c67005f221f102fe2caca231027d9b11cf630484 made the local var in partials available only if what passed to `:object` was truthy. For example this would not make the local variable `foo` available inside the partial: render partial: 'foo', object: false Fixes #17373.
* | | | | Merge pull request #17733 from yuki24/do-not-rescue-exception-in-params-parserRafael Mendonça França2014-11-252-1/+11
|\ \ \ \ \ | | | | | | | | | | | | Do not rescue Exception in ActionDispatch::ParamsParser
| * | | | | Do not rescue Exception in ParamsParserYuki Nishijima2014-11-232-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike ShowExceptions or PublicExceptions, ParamsParser shouldn't transform exceptions like Interrupt and NoMemoryError into ParserError.
* | | | | | Use released arelRafael Mendonça França2014-11-252-2/+1
| | | | | |
* | | | | | Use released rails-dom-testingRafael Mendonça França2014-11-255-6/+3
| | | | | |
* | | | | | Merge pull request #17768 from bruno-/router-visualizer-css-fixRafael Mendonça França2014-11-251-4/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Small fix for the router visualizer
| * | | | | | CSS fix for the router visualizerBruno Sutic2014-11-251-4/+0
| | | | | | |
* | | | | | | Move PG float quoting to the correct locationSean Griffin2014-11-251-16/+6
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | Not sure how we missed this case when we moved everything else to the `_quote` method.
* | | | | | Merge pull request #17769 from gsamokovarov/remove-slash-console-referencesRafael Mendonça França2014-11-252-14/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove Web Console /console references in the guides
| * | | | | | Remove Web Console /console references in the guidesGenadi Samokovarov2014-11-252-14/+4
|/ / / / / /
* | | | | | Merge pull request #17739 from rails/bring_back_db_test_prepareYves Senn2014-11-256-17/+120
|\ \ \ \ \ \ | | | | | | | | | | | | | | bring back `db:test:prepare`.
| * | | | | | bring back `db:test:prepare`.Yves Senn2014-11-255-15/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts deprecations added in #13528. The task is brought back for two reasons: 1. Give plugins a way to hook into the test database initialization process 2. Give the user a way to force a test database synchronization While `test:prepare` is still a dependency of every test task, `db:test:prepare` no longer hooks into it. This means that `test:prepare` runs before the schema is synchronized. Plugins, which insert data can now hook into `db:test:prepare`. The automatic schema maintenance can't detect when a migration is rolled-back, modified and reapplied. In this case the user has to fall back to `db:test:prepare` to force the synchronization to happen.
| * | | | | | do not trigger AR lazy load hook before initializers ran.Yves Senn2014-11-251-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Rafael Mendonça França & Yves Senn] This require caused the `active_record.set_configs` initializer to run immediately, before `config/initializers`. This means that setting any configuration on `Rails.application.config.active_record` inside of an initializer had no effects when rails was loaded through `rake`. Introduced by #6518 /cc @rafaelfranca
* | | | | | | Setting an association replaces records with the same id in memorySean Griffin2014-11-252-2/+82
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The records weren't being replaced since equality in Active Record is defined in terms of `id` only. It is reasonable to expect that the references would be replaced in memory, even if no queries are actually executed. This change did not appear to affect any other parts of the code base. I chose not to execute callbacks since we're not actually modifying the association in a way that will be persisted. Fixes #17730
* | | | | | Merge pull request #17767 from javiervidal/fixing_documentationRafael Mendonça França2014-11-251-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixing wrong link in 'Ruby on Rails 3.0 Release Notes' [ci skip]
| * | | | | | Fixing wrong link in 'Ruby on Rails 3.0 Release Notes' [ci skip]Javier Vidal2014-11-251-1/+1
|/ / / / / /
* | | | | | Merge pull request #17754 from eileencodes/refactor-aliased_table_forSantiago Pastorino2014-11-252-13/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Combine aliased_table_for and aliased_name_for
| * | | | | Combine aliased_table_for and aliased_name_foreileencodes2014-11-242-13/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This refactoring reduces the number of conditionals needed to build `aliased_table_for` and removes `aliased_name_for` because it's no longer necessary. `aliased_name_for` was also used in `JoinDependency#initialize` so that was replaced with `aliased_table_for` as well.
* | | | | | Merge pull request #17753 from gsamokovarov/dont-center-routing-tableSantiago Pastorino2014-11-251-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Don't center the routes table on routing errors
| * | | | | | Don't center the routes table on routing errorsGenadi Samokovarov2014-11-241-1/+1
| | | | | | |
* | | | | | | tests, run `test_test.rb` with `RAILS_ENV=test`.Yves Senn2014-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tests to verify our testing setup used `RAILS_ENV=development` to execute the tests. Let's keep it as close to a real-world setup as possible.
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 12:08:43 +0000