aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Merge pull request #151 from vatrai/action_view_basicVishnu Atrai2013-06-151-0/+17
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | date_field docs for action view
| | * | | | | | | date_field docs for action viewVishnu Atrai2013-06-151-0/+17
| | | | | | | | |
| * | | | | | | | Change "." to ":" for formatting purposeVipul A M2013-06-151-1/+1
| |/ / / / / / /
| * | / / / / / `dasboard` => `dashboard`Vipul A M2013-06-151-4/+4
| | |/ / / / / | |/| | | | |
| * | | | | | `existant` => `existent`Vipul A M2013-06-151-1/+1
| | | | | | |
| * | | | | | Merge pull request #142 from codyrobbins/masterVijay Dev2013-06-131-0/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Added a warning about #1769 to the routing guide
| | * | | | | | Added a warning about #1769 to the routing guide.Cody Robbins2013-06-071-0/+6
| | | | | | | |
* | | | | | | | Merge pull request #11112 from arunagw/rakefile_changesCarlos Antonio da Silva2013-06-262-9/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Minor changes to actionpack/actionview Rakefile
| * | | | | | | | Minor changes to actionpack/actionview RakefileArun Agrawal2013-06-262-9/+1
| | | | | | | | |
* | | | | | | | | remove trailing whitespace from `config/routes.rb` template.Yves Senn2013-06-261-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #11109 from ↵Yves Senn2013-06-251-8/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wangjohn/moving_pluck_and_ids_to_new_delegate_line Moving the `pluck` and `ids` methods to their own delegate line.
| * | | | | | | | Moving the `pluck` and `ids` methods to their own delegate line.wangjohn2013-06-251-8/+9
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These two methods aren't really statistical helper methods and don't really belong in any other group which is being delegated for querying, so I'm moving them to their own group of methods. I've also changed the `:to => :all` hash syntax to `to: :all`.
* | | | | | | | Fix @tenderlove's name in changelog :sparkles:Carlos Antonio da Silva2013-06-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge pull request #10542 from waseem/remove_requireCarlos Antonio da Silva2013-06-251-1/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove unnecessary require from active_support/inflector/methods.rb
| * | | | | | | | Remove unnecessary require from active_support/inflector/methods.rbWaseem Ahmad2013-05-101-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `active_support/inflections` already requires `active_support/inflector/inflections`. There's no need to require it in `active_support/inflector/methods`.
* | | | | | | | | Merge pull request #10774 from ↵Carlos Antonio da Silva2013-06-254-4/+15
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | chuckbergeron/validates-inclusion-of-accuracy-for-non-numeric-ranges Greater accuracy for validates_inclusion_of on non-numeric ranges Closes #10774, fixes #10593
| * | | | | | | | | Use Range#cover? for Numeric ranges (tests via endpoints) and use ↵Charles Bergeron2013-05-274-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Range#include? for non-numeric ranges added changelog message
* | | | | | | | | | Merge pull request #10627 from vipulnsward/destructive_symbolizeCarlos Antonio da Silva2013-06-251-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Change to destructive `deep_symbolize_keys` to avoid a new hash creation.
| * | | | | | | | | | change to destructive `deep_symbolize_keys` after ↵Vipul A M2013-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/rails/rails/commit/df24b8790f22384a068fece7042f04ffd2fcb33e which allows to do so. This helps to avoid extra hash object creation, by symbolizing inplace
* | | | | | | | | | | Merge pull request #10666 from YanhaoYang/masterCarlos Antonio da Silva2013-06-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Make "rails dbconsole" work with activerecord-postgis-adapter
| * | | | | | | | | | | make "rails dbconsole" work with activerecord-postgis-adapterYanhaoYang2013-05-171-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #10730 from ↵Carlos Antonio da Silva2013-06-251-8/+9
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tkhr/add_test_for_AR__CounterCache#update_counters Add test for AR::CounterCache.update_counters
| * | | | | | | | | | | | Refactor AR's counter_cache_test.rb testTakehiro Adachi2013-05-231-8/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add test for AR::CounterCache.update_countersTakehiro Adachi2013-05-231-0/+6
| | | | | | | | | | | | |
* | | | | | | | | | | | | Add changelog entry for database tasks removal #10853 [ci skip]Carlos Antonio da Silva2013-06-251-0/+4
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #10853 from kennyj/deprecated-database_tasksCarlos Antonio da Silva2013-06-257-433/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Oracle / Sqlserver / Firebird database tasks were deprecated since 4.0.
| * | | | | | | | | | | | | Remove FirebirdDatabaseTasks was deprecated, because this was provided by ↵kennyj2013-06-053-158/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3rd-party.
| * | | | | | | | | | | | | Remove SqlseverDatabaseTasks was deprecated, because this was provided by ↵kennyj2013-06-053-136/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3rd-party.
| * | | | | | | | | | | | | Remove OracleDatabaseTasks was deprecated, because this was provided by ↵kennyj2013-06-053-139/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3rd-party.
* | | | | | | | | | | | | | Merge branch 'cache-fragment-refactor'Carlos Antonio da Silva2013-06-251-13/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #10819
| * | | | | | | | | | | | | | Refactor cache fragment handling with read/write methodsCarlos Antonio da Silva2013-06-251-6/+6
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Move the write portion of fragment_for to its own method to allow for easier ↵Andrew Rove2013-06-251-10/+14
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | creation of custom cache methods.
* | | | | | | | | | | | | | Merge pull request #10992 from Empact/find-each-enumeratorCarlos Antonio da Silva2013-06-253-2/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When .find_each is called without a block, return an Enumerator.
| * | | | | | | | | | | | | | When .find_each is called without a block, return an Enumerator.Ben Woosley2013-06-193-2/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This lets us do things like call: .find_each.with_index
* | | | | | | | | | | | | | | Merge pull request #10993 from Empact/result-each-enumeratorCarlos Antonio da Silva2013-06-253-1/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change Result#each to return an Enumerator when called without a block.
| * | | | | | | | | | | | | | | Change Result#each to return an Enumerator when called without a block.Ben Woosley2013-06-183-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As with #10992, this lets us call #with_index, etc on the results.
* | | | | | | | | | | | | | | | Merge pull request #11105 from mariozig/correct-documentationCarlos Antonio da Silva2013-06-252-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | Fix typo in docs. HABTM associations should use a pluralized name [ci skip]
| * | | | | | | | | | | | | | | Fix typo in docs. HABTM associations should use a pluralized namemariozig2013-06-252-2/+2
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #11000 from sbeckeriv/accept_headerCarlos Antonio da Silva2013-06-253-1/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix undefined method `ref' for nil:NilClass for bad accept headers
| * | | | | | | | | | | | | | | Fix undefined method `ref' for nil:NilClass for bad accept headersStephen Becker IV2013-06-193-1/+11
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #11046 from arunagw/verbose_mode_onCarlos Antonio da Silva2013-06-255-5/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Verbose mode on when running tests
| * | | | | | | | | | | | | | | | Adding verbose in isolated test.Arun Agrawal2013-06-215-5/+5
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Adding verbose mode to test_with_ar_integrationArun Agrawal2013-06-211-0/+2
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'error-explanation'Carlos Antonio da Silva2013-06-252-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #11077 [ci skip]
| * | | | | | | | | | | | | | | | | Fix another "error_explanation" css class in guides [ci skip]Carlos Antonio da Silva2013-06-251-3/+3
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | change id="errorExplanation" to id="error_explanation" to match the ↵Luzi Humm2013-06-251-3/+3
|/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | generated files
* | | | | | | | | | | | | | | | | Merge pull request #11096 from akalyaev/remove-unnecessary-mappingCarlos Antonio da Silva2013-06-251-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed unnecessary mapping for on options
| * | | | | | | | | | | | | | | | | removed unnecessary mapping for on optionsAnton Kalyaev2013-06-251-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right before that in `assert_valid_transaction_action` method we make sure that `options[:on]` contains values from `ACTIONS` array (`[:create, :destroy, :update]`) and nothing more (i.e. it could not contain strings or something else, otherwise the error is raised). Also I've polished some docs.
* | | | | | | | | | | | | | | | | | Merge pull request #11095 from vipulnsward/rails_4_docsXavier Noria2013-06-253-5/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are now rails 4
| * | | | | | | | | | | | | | | | | | We are now rails 4 [skip-ci]Vipul A M2013-06-263-5/+8
| | | | | | | | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-31 16:33:35 +0000