aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | fix railties CHANGELOG [ci skip]Francesco Rodriguez2012-12-181-2/+3
|/ / /
* | | Fix argument name in fixtures methodCarlos Antonio da Silva2012-12-181-1/+1
| | | | | | | | | | | | Relatedo to 8e44c93b4c0e4b1bdd0fca13b79f5be1088d6959.
* | | Revert "use File.basename to get the filename minus .yml"Aaron Patterson2012-12-181-4/+3
| | | | | | | | | | | | | | | | | | | | | This reverts commit 00c5342d96a3677c0a6a2bb8316c76182f5bdfdd. Conflicts: activerecord/lib/active_record/fixtures.rb
* | | Revert "Merge pull request #7587 from elia/fix-too-eager-loading"Rafael Mendonça França2012-12-183-17/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3663057518eb9acf9b1e72f47dcb07038e6b7368. REASON: This caused a regression that add app folder in the eager load path. See #8146 for more information. Conflicts: railties/CHANGELOG.md
* | | Merge pull request #8548 from ↵Rafael Mendonça França2012-12-182-4/+17
|\ \ \ | | | | | | | | | | | | | | | | garysweaver/postgresql_fallback_to_disable_user_triggers fix #5523: postgresql adapter to disable user triggers in disable_referential_integrity
| * | | #5523 Add ability for postgresql adapter to disable user triggers in ↵Gary S. Weaver2012-12-182-4/+17
|/ / / | | | | | | | | | disable_referential_integrity.
* | | Fix changelogDavid Heinemeier Hansson2012-12-181-3/+1
| | |
* | | MergeDavid Heinemeier Hansson2012-12-1822-49/+374
|\ \ \
| * \ \ Merge branch 'uniqueness-validation-postgresql-arrays'Carlos Antonio da Silva2012-12-183-35/+58
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When setting an array column (or other PostgreSQL-specific data type) to be validated for uniqueness, the resulting SQL query is generated with syntax errors, like this: SELECT 1 AS one FROM "postgresql_arrays" WHERE "postgresql_arrays"."nicknames" = '["john", "johnny"]' LIMIT 1 This happens because Ruby Arrays must be type-casted to their PostgreSQL equivalent. This small patch fixes this issue, calling the adapter's type_cast method. Closes #8077
| | * | | Extract some methodsCarlos Antonio da Silva2012-12-181-16/+22
| | | | |
| | * | | Change relation in placeCarlos Antonio da Silva2012-12-181-1/+1
| | | | |
| | * | | Simplify value logic by always typecastingCarlos Antonio da Silva2012-12-181-11/+5
| | | | |
| | * | | Avoid unnecessary hashes with error optionsCarlos Antonio da Silva2012-12-181-1/+4
| | | | |
| | * | | Remove prepend_and_append requirement from ASCarlos Antonio da Silva2012-12-181-3/+1
| | | | | | | | | | | | | | | | | | | | It's not necessary to use this extension here, we are fine with Array#unshift.
| | * | | Refactor uniqueness validator logic a bitCarlos Antonio da Silva2012-12-181-10/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Cleanup some code, avoid extra hash with reverse_merge, and don't use send for :id, since it's always present.
| | * | | Added support for validates_uniqueness_of in PostgreSQL array columns. ↵Pedro Padron2012-12-183-4/+31
| |/ / / | | | | | | | | | | | | Fixes: #8075.
| * | | Minor js review [ci skip]Carlos Antonio da Silva2012-12-181-7/+7
| | | | | | | | | | | | | | | | Remove/add ; where necessary, fix indentation.
| * | | Merge pull request #8389 from nashby/issue-8388Steve Klabnik2012-12-183-3/+33
| |\ \ \ | | | | | | | | | | handle protocol option in stylesheet_link_tag and javascript_include_tag
| | * | | handle protocol option in stylesheet_link_tag and javascript_include_tagVasiliy Ermolovich2012-12-183-3/+33
| |/ / / | | | | | | | | | | | | closes #8388
| * | | Merge pull request #8543 from schneems/schneems/html-route-errorRafael Mendonça França2012-12-176-76/+81
| |\ \ \ | | | | | | | | | | Format routes as html on debug page
| | * | | Format routes as html on debug pageschneems2012-12-176-76/+81
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When someone gets a routing exception, the routes are rendered (starting in Rails 4.0). This PR brings parity between the html routes in the `rails/info/routes` path and when rendered from an exception. This is the continuation of #8521 which brought html formatted routes. In addition to bringing parity to the two views, we're keeping our views DRY by rendering off of the same partials. In this case Railties depends on partials provided by ActionDispatch. I'm open to alternative implementations. Ideally both views will use the same code so any improvements or updates to it will be reproduced on both. <hr /> ![](http://f.cl.ly/items/3O1D0K1v0j0i343O3T3T/Screen%20Shot%202012-12-17%20at%203.07.20%20PM.png)
| * | | Merge pull request #8542 from le0pard/fixed_ar_intrangeRafael Mendonça França2012-12-172-5/+29
| |\ \ \ | | | | | | | | | | AR supporting new int4range and int8range data type on PostgreSQL >= 9.2. Fix #8528 pull request
| | * | | AR supporting new int4range and int8range data type on PostgreSQL >= 9.2. ↵Alexey2012-12-172-5/+29
| | | | | | | | | | | | | | | | | | | | Fix realization
| * | | | Merge pull request #8528 from le0pard/fixed_ar_intrangeRafael Mendonça França2012-12-179-5/+170
| |\| | | | | | | | | | | | | AR supporting new int4range and int8range data type on PostgreSQL >= 9.2
| | * | | AR supporting new intrange data type on PostgreSQL >= 9.2Alexey2012-12-169-5/+170
| | | | |
| * | | | Merge pull request #8521 from schneems/schneems/html-routesRafael Mendonça França2012-12-174-4/+80
| |\ \ \ \ | | | | | | | | | | | | HTML formatting to Rails::InfoController#routes
| | * | | | HTML formatting to Rails::InfoController#routesschneems2012-12-174-4/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR adds formatting and meta-data to the display of the internal routes. Users can now toggle between showing helpers with the `_path` or _`url` suffix. There are multiple ways to achieve this, this method uses partials for formatting and meta-data. The partials can be re-used when rendering `routing_error.erb`, though that will need to be in a separate PR. ![](http://f.cl.ly/items/3A2p3c1T1t2f2X2R2K2S/Screen%20Shot%202012-12-12%20at%202.28.01%20PM.png) ATP Railties
* | | | | | Add app/models/concerns and app/controllers/concerns to the default ↵David Heinemeier Hansson2012-12-183-0/+17
|/ / / / / | | | | | | | | | | | | | | | directory structure and load path
* | | | | Make conditional_layout? private and update documentationAndrew White2012-12-171-15/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The conditional_layout? method is not for public use and doesn't actually do what the documentation suggested it does. It's actually used to determine whether or not to use the explicit layout definition defined in a controller or use the implicit layout definition. Also documentation was added for the action_has_layout? method which acts as a master switch for disabling the layout for the current action. This method was added so that action caching didn't depend on accessing layout internals but is also used by third-parties, most notably the [Hobo][1] application. [1]: https://github.com/hobo/hobo
* | | | | Merge pull request #8539 from frodsan/fix_as_basic_objectCarlos Antonio da Silva2012-12-171-2/+1
|\ \ \ \ \ | | | | | | | | | | | | Add nodoc to AS::BasicObject [ci skip]
| * | | | | fix AS::BasicObject :nodoc: [ci skip]Francesco Rodriguez2012-12-171-2/+1
|/ / / / /
* | | | | Merge pull request #8532 from ptn/add_missing_requireXavier Noria2012-12-161-0/+3
|\ \ \ \ \ | | | | | | | | | | | | Add missing requires to core_ext/integer/time
| * | | | | Add missing requires to core_ext/integer/timePablo Torres2012-12-161-0/+3
|/ / / / /
* | | | | Merge pull request #8529 from schneems/schneems/debug-exceptions-extend-pathSteve Klabnik2012-12-161-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | DebugExceptions `File.join` => `File.expand_path`
| * | | | DebugExceptions `File.join` => `File.expand_path`schneems2012-12-161-1/+1
| | | | |
* | | | | Restored 'Working with Validation Errors'Steve Klabnik2012-12-161-0/+140
| |/ / / |/| | | | | | | | | | | | | | | Somehow this got lost in my PRs before. I'm going to re-check all the guides to make sure this didn't happen again elsewhere.
* | | | Merge pull request #8518 from rwz/inheritable-basic-objectJeremy Kemper2012-12-152-2/+19
|\ \ \ \ | | | | | | | | | | Properly deprecate AS::BasicObject without breaking subclasses of it
| * | | | AS::BasicObject can be inherited fromPavel Pravosud2012-12-152-2/+19
| | | | |
* | | | | Add `ActiveModel::Validations::AbsenceValidator`, a validator to check the ↵Roberto Vasquez Angel2012-12-155-0/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | absence of attributes. Add `ActiveModel::Errors#add_on_present` method. Adds error messages to present attributes.
* | | | | Merge pull request #8519 from rubys/masterRafael Mendonça França2012-12-151-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Remove blank lines from generated Gemfile
| * | | | | Remove blank lines from generated GemfileSam Ruby2012-12-151-2/+2
|/ / / / / | | | | | | | | | | | | | | | Introduced by 059bdc3415b0f1fb436c56a399a41b90fe3e87f0
* | | | / make an editing pass through the upgrading guide [ci skip]Vijay Dev2012-12-151-30/+16
| |_|_|/ |/| | |
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-12-1515-189/+435
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/form_helper.rb railties/lib/rails/info_controller.rb
| * | | copy editing [ci skip]Vijay Dev2012-12-153-3/+3
| | | |
| * | | bullets have fullstops too [ci skip]Vijay Dev2012-12-151-4/+4
| | | |
| * | | Revert "Add quotes to Numeric Passwords to force string(sqlserver)"Vijay Dev2012-12-151-2/+0
| | | | | | | | | | | | | | | | This reverts commit d1e70cb7b410f5151b08af9b38b2d6d80c1c61c2.
| * | | Revert "Add quotes to Numeric Passwords to force string(jdbcmysql)"Vijay Dev2012-12-151-2/+0
| | | | | | | | | | | | | | | | This reverts commit 2f0311d79af01dc59ab3bd95cd6a56511258f917.
| * | | Revert "Add quotes to Numeric Passwords to force string(jdbcpostgresql)"Vijay Dev2012-12-151-2/+0
| | | | | | | | | | | | | | | | This reverts commit db9b619f2851d7aeef9b239f6c19d0076faf5909.
| * | | Revert "Add quotes to Numeric Passwords to force string(MySql)"Vijay Dev2012-12-151-2/+0
| | | | | | | | | | | | | | | | This reverts commit e5f8b2be64a74ce05e7c8b873d3e795e7bc68df5.
| * | | Revert "Add quotes to Numeric Passwords to force string(Postgres)"Vijay Dev2012-12-151-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6e72099a382c9731c7b40aa1b10237318e31ac92. Reason: Feel that this isn't the right place.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-15 12:50:32 +0000