aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Merge pull request #8989 from robertomiranda/use-rails-4-find-by"Guillermo Iguaran2013-01-1823-70/+70
| | | | | This reverts commit 637a7d9d357a0f3f725b0548282ca8c5e7d4af4a, reversing changes made to 5937bd02dee112646469848d7fe8a8bfcef5b4c1.
* Merge pull request #8989 from robertomiranda/use-rails-4-find-byGuillermo Iguaran2013-01-1823-70/+70
|\ | | | | Replace deprecated find_by_* with find_by
| * User Rails 4 find_byrobertomiranda2013-01-1823-70/+70
| |
* | Undeprecate the :extend optionJon Leighton2013-01-186-3/+30
| | | | | | | | | | | | | | Suggested by @dhh. It doesn't affect the generated SQL, so seems reasonable to continue to allow it as an association option.
* | CollectionProxy should be default scopedJon Leighton2013-01-182-0/+6
| | | | | | | | Fixes #8795
* | Merge pull request #8912 from senny/8879_association_empty_methodJon Leighton2013-01-183-1/+19
|\ \ | | | | | | `CollectionAssociation#empty?` respects newly builded records
| * | `CollectionAssociation#empty?` respects newly builded recordsYves Senn2013-01-133-1/+19
| | |
* | | s/it's/its/Akira Matsuda2013-01-181-1/+1
| | | | | | | | | | | | [ci skip]
* | | script => binAkira Matsuda2013-01-182-7/+7
| | |
* | | use tap with block parameterAkira Matsuda2013-01-181-1/+1
| | |
* | | iterates the RDoc of update_column(s)Xavier Noria2013-01-181-13/+13
| |/ |/| | | | | | | | | | | | | This revision makes crystal clear that the methods go straight to the database and update the receiver. It also adds and example, and removes the duplication in the singular and plural forms by referring one to the other.
* | Refactor predicate builder when receiving empty hashCarlos Antonio da Silva2013-01-171-4/+4
| | | | | | | | | | | | | | There's no need to create a new arel table or reflect on the column association if the value is empty, these attributes are not used. Also no need to concat a new array, just append the query value.
* | Merge pull request #8976 from senny/spelling_correctionXavier Noria2013-01-171-1/+1
|\ \ | | | | | | spelling correction for Action Mailer interceptors
| * | spelling correction for AM interceptorsYves Senn2013-01-171-1/+1
|/ /
* | Remove useless || operationCarlos Antonio da Silva2013-01-172-3/+2
| |
* | Merge pull request #8975 from arunagw/warning_removed_ambiguous_first_argumentCarlos Antonio da Silva2013-01-171-4/+4
|\ \ | | | | | | Removing : warning: ambiguous first argument;
| * | Removing : warning: ambiguous first argument;Arun Agrawal2013-01-171-4/+4
|/ /
* | Deprecate direct calls to AC::RecordIdentifier.dom_id and dom_classCarlos Antonio da Silva2013-01-163-9/+58
| | | | | | | | Also add some generic tests to ensure they're properly deprecated.
* | Merge pull request #8964 from mattdbridges/specify-log-to-clearCarlos Antonio da Silva2013-01-163-5/+24
|\ \ | | | | | | Clear specific logs when using `rake log:clear`
| * | clear specific logs when using rake log:clearMatt Bridges2013-01-163-5/+24
| | |
* | | Merge pull request #8967 from senny/add_interceptor_to_am_docXavier Noria2013-01-161-0/+20
|\ \ \ | | | | | | | | document Intercepters in ActionMailer guide
| * | | document Intercepters in ActionMailer guideYves Senn2013-01-161-0/+20
| | | |
* | | | Merge pull request #8965 from colinbm/date_select_valueCarlos Antonio da Silva2013-01-162-2/+65
|\ \ \ \ | |/ / / |/| | | Fix date_select :selected option so you can pass it nil
| * | | Fix date_select :selected option so you can pass it nilColin Burn-Murdoch2013-01-162-2/+65
|/ / /
* | | Merge pull request #8959 from vitorbaptista/masterRafael Mendonça França2013-01-163-3/+6
|\ \ \ | | | | | | | | Don't rely on Hash key's ordering to configure default options
| * | | Don't rely on Hash key's orderingVitor Baptista2013-01-163-3/+6
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we set encoding latin1 for a PostgreSQL database, it calls PostgreSQLAdapter::create_database with options that have, among other things: { 'encoding' => 'latin1' } Then, we use reverse_merge(:encoding => "utf8") to setup the default encoding. In the end, the hash looks like: { :encoding => 'utf8', 'encoding' => 'latin1' } The call to options.symbolize_keys calls to_sym on each_key of this Hash. It usually means that the encoding passed overwrites the default utf8, but it's not guaranteed. So, we shouldn't rely on it. The same was happening in ActiveRecord::ConnectionHandling.
* | | Remove warnings: "(...) interpreted as grouped expression"Carlos Antonio da Silva2013-01-161-2/+2
| | |
* | | Merge pull request #8963 from asanghi/regress_8631Andrew White2013-01-161-0/+21
|\ \ \ | |/ / |/| | adding regression test in master for #8631
| * | adding regression test in master for #8631Aditya Sanghi2013-01-161-0/+21
|/ /
* | Merge pull request #8955 from burns/source_annotationRafael Mendonça França2013-01-153-16/+76
|\ \ | | | | | | Allow a `:dirs` option to `SourceAnnotationExtractor.enumerate`
| * | allow :dirs option for .enumerateBrian D. Burns2013-01-153-6/+60
| | | | | | | | | | | | | | | | | | Allows custom rake tasks to be defined using: SourceAnnotationExtractor.enumerate 'TODO|FIXME', dirs: %w(app lib), tag: true
| * | use case statementBrian D. Burns2013-01-151-10/+16
| | |
* | | Merge pull request #8958 from balexand/strong_parameters_exception_handlingRafael Mendonça França2013-01-154-16/+14
|\ \ \ | | | | | | | | Strong parameters exception handling
| * | | strong parameters exception handlingBrian Alexander2013-01-154-16/+14
| | | |
* | | | Merge pull request #8914 from nilbus/fix-header-bloatRafael Mendonça França2013-01-153-2/+10
|\ \ \ \ | |/ / / |/| | | Remove header bloat introduced by BestStandardsSupport middleware
| * | | Remove header bloat introduced by BestStandardsSupport middlewareEdward Anderson2013-01-153-2/+10
|/ / / | | | | | | | | | The same headers were being duplicated on every request.
* | | Merge pull request #8954 from davetoxa/patch-1Carlos Antonio da Silva2013-01-151-1/+0
|\ \ \ | | | | | | | | Update guides/source/active_record_validations.md
| * | | Update guides/source/active_record_validations.mdAnton Cherepanov2013-01-151-1/+0
| | | | | | | | | | | | Duplicated `update`
* | | | Merge pull request #8940 from adomokos/adding_tests_for_changed_attributesCarlos Antonio da Silva2013-01-151-1/+12
|\ \ \ \ | |_|/ / |/| | | Cleaning up ActiveModel::Dirty tests
| * | | Cleaning up ActiveModel::Dirty testsAttila Domokos2013-01-151-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Clarifying what the #changed method returns * Adding tests to describe what the #changed_attributes returns * Updating test name based on pull request comment * Moving the test lower in the file per pull request comment
* | | | Change the behavior of route defaultsAndrew White2013-01-157-11/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit changes route defaults so that explicit defaults are no longer required where the key is not part of the path. For example: resources :posts, bucket_type: 'posts' will be required whenever constructing the url from a hash such as a functional test or using url_for directly. However using the explicit form alters the behavior so it's not required: resources :projects, defaults: { bucket_type: 'projects' } This changes existing behavior slightly in that any routes which only differ in their defaults will match the first route rather than the closest match. Closes #8814
* | | | Add support for other types of routing constraintsAndrew White2013-01-155-113/+237
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This now allows the use of arrays like this: get '/foo/:action', to: 'foo', constraints: { subdomain: %w[www admin] } or constraints where the request method returns an Fixnum like this: get '/foo', to: 'foo#index', constraints: { port: 8080 } Note that this only applies to constraints on the request - path constraints still need to be specified as Regexps as the various constraints are compiled into a single Regexp.
* | | | Ensure port is set when passed via the process methodAndrew White2013-01-153-1/+58
| | | |
* | | | Raise correct exception now Journey is integrated.Andrew White2013-01-153-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that Journey has been integrated into ActionDispatch we can raise the exception ActionController::UrlGenerationError directly rather than raising the internal Journey::Router::RoutingError and then have ActionDispatch::Routing::RouteSet#generate re-raise the exception.
* | | | Revert "Merge pull request #8930 from cordawyn/ordered_railties"Carlos Antonio da Silva2013-01-152-5/+1
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8348f9ea72c9b50fc4d4462fd9ebe3bba932c783, reversing changes made to 9dfe2d6f9fabddf9a451a995678a9648c8aaf401. Reason: this broke railties tests as explained in the issue, and the author is going to review and report back. https://github.com/rails/rails/pull/8930#issuecomment-12272671
* | | Merge pull request #8930 from cordawyn/ordered_railtiesCarlos Antonio da Silva2013-01-152-1/+5
|\ \ \ | | | | | | | | rake railties:install:migrations respects the order of railties
| * | | rake railties:install:migrations respects the order of railtiesSlava Kravchenko2013-01-142-1/+5
| | | |
* | | | Revert "log at debug level what line caused the redirect_to"Carlos Antonio da Silva2013-01-151-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3fa00070047b5d019d39e691598ee2890283d052. Reason: This message is usually not accurate and annoying: Redirected by ~/.rbenv/versions/1.9.3-p327-perf/lib/ruby/1.9.1/logger.rb:371:in `add'`
* | | | Improve mysql database tasks handling to ensure we always rescue from an ↵Carlos Antonio da Silva2013-01-151-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | exception We were previously rescuing "nil" when no exception class was found. This does work in 1.9.3, but does not in 2.0, raising an exception asking for a class or module to be given to the rescue clause. Thanks @yahonda for catching this.
* | | | Revert "Merge pull request #8942 from yahonda/tested_only_with_mysql"Carlos Antonio da Silva2013-01-151-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1fc294f988e93ac59057a16b0e44b9cf93af9720, reversing changes made to fb9ac47c286fbdfe05263d4d0346e50892090603. Reason: these tests should run fine independent of database, since they should only take into account the configuration options. The problem was related to a change in the way "nil" is handled by the rescue clause, in Ruby 2.0 it raises an exception asking for class or module, in 1.9 it passes.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 03:24:12 +0000