aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* better document `next_week` functionaility closes #9568Jon Rowe2013-04-262-5/+10
|
* ActiveRecord -> Active RecordXavier Noria2013-04-251-1/+1
|
* fixes warning in the AR test suiteXavier Noria2013-04-251-1/+1
|
* Revert "Merge pull request #10337 from eimermusic/fix_template_digestor_lookup"Rafael Mendonça França2013-04-253-11/+2
| | | | | | | | This reverts commit b4239622afc4f3f73808fd0c97512f3a534e07dd, reversing changes made to f99ce3c188f5dde57e2ff63e6a22363c62f0a4cd. Reason: This broke the build https://travis-ci.org/rails/rails/jobs/6629894
* Merge pull request #10337 from eimermusic/fix_template_digestor_lookupRafael Mendonça França2013-04-253-2/+11
|\ | | | | | | | | | | | | Fix ActionView::Digestor to correctly pass format to LookupContext Conflicts: actionpack/CHANGELOG.md
| * AV Digestor correctly passes format to LookupContextMartin Westin2013-04-253-2/+11
| | | | | | | | | | | | | | | | ActionView::Digestor now passes arguments correctly to LookupContext::find method. This makes cache digests respect the format option correctly. FixtureFinder in tests also changed to reflect this.
* | Add support for extra options to `force_ssl`Andrew White2013-04-253-31/+159
| | | | | | | | | | | | | | | | This commit adds support for passing additional url options along with a :status option and any of the flash-related options to `redirect_to` (i.e. :flash, :alert & :notice). Closes #7570.
* | Use `request.fullpath` to build redirect url in `force_ssl`Andrew White2013-04-253-4/+79
|/ | | | | | | | | | | The `force_ssl` command now builds the redirect url from `request.fullpath`. This ensures that the format is maintained and it doesn't redirect to a route that has the same parameters but is defined earlier in `routes.rb`. Also any optional segments are maintained. Fixes #7528. Fixes #9061. Fixes #10305.
* Review DatabaseTasks docs [ci skip]Carlos Antonio da Silva2013-04-241-17/+17
|
* Merge pull request #10333 from ikataitsev/move-test-method-to-testsRafael Mendonça França2013-04-242-8/+9
|\ | | | | Move method used only in the test to the test code itself
| * Move method used only in the test to the test code itselfIvan Kataitsev2013-04-252-8/+9
| |
* | Minor AR changelog review [ci skip]Carlos Antonio da Silva2013-04-241-6/+8
|/
* Merge pull request #10332 from vipulnsward/number_helperRafael Mendonça França2013-04-241-2/+3
|\ | | | | refactor number helper
| * refactor number helperVipul A M2013-04-251-2/+3
| |
* | Merge branch 'active-record-standalone-improvements'Piotr Sarnacki2013-04-244-24/+92
|\ \
| * | Use env == 'development' instead of env.development?Piotr Sarnacki2013-04-241-1/+1
| | | | | | | | | | | | | | | | | | It's simpler to assume that passed env is just a string without any extensions, especially when DatabaseTasks are intended to be used also without rails.
| * | Move CHANGELOG entry for db.rake improvements to 4.0.0Piotr Sarnacki2013-04-241-3/+1
| | |
| * | Don't require Rails.env in order to use AR::Tasks::DatabaseTasksPiotr Sarnacki2013-04-242-6/+8
| | |
| * | Add some documentation to ActiveRecord::Tasks::DatabaseTasksPiotr Sarnacki2013-04-241-1/+29
| | | | | | | | | | | | | | | | | | This is a public class, which could be used directly in order to allow easier database management. Now it also contains settings, which will be used by databases.rake.
| * | Use DatabaseTasks.fixtures_path instead of FIXTURES_PATH in db.rakePiotr Sarnacki2013-04-243-3/+22
| | | | | | | | | | | | | | | | | | This will allow to set fixtures path in global config easier, it should be not needed to use FIXTURES_PATH every time user wants to load fixtures.
| * | Don't require having Rails.application to run database tasksPiotr Sarnacki2013-04-244-15/+36
| | |
* | | Merge pull request #10330 from kennyj/fix_10067Rafael Mendonça França2013-04-243-1/+22
|\ \ \ | | | | | | | | Serialized column should not be wrapped twice. Fix #10067.
| * | | Added testcase for #10067 and a CHANGELOG entry about this change.kennyj2013-04-252-0/+21
| | | |
| * | | Fix a SystemStackError that occurs when using time zone aware attributes.Dan Erikson2013-04-251-1/+1
|/ / / | | | | | | | | | This fixes issue #10066
* | | Merge pull request #10331 from neerajdotname/exec-migration-in-transactionGuillermo Iguaran2013-04-241-8/+9
|\ \ \ | | | | | | | | Remove code duplication
| * | | Remove code duplicationNeeraj Singh2013-04-241-8/+9
| | |/ | |/|
* | | Merge pull request #10256 from ↵Rafael Mendonça França2013-04-242-4/+4
|\ \ \ | |/ / |/| | | | | | | | | | | | | | wangjohn/moving_check_for_test_environment_into_rails_env Moved the check for the rails test environment into rails.rb Closes #10238
| * | Moved the check for the rails test environment into rails/test_unit so that youwangjohn2013-04-232-4/+4
| | | | | | | | | | | | can select frameworks separately when running rake test.
* | | Lookup the class at runtime, not when the association is builtAndrew White2013-04-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Trying to lookup the parent class when the association is being built runs the risk of generating uninitialized constant errors because classes haven't been fully defined yet. To work around this we look up the class at runtime through the `association` method. Fixes #10197.
* | | Removed unused associationsAndrew White2013-04-241-2/+0
| | |
* | | Reset the primary key for other testsAndrew White2013-04-241-0/+2
| | |
* | | added test cases for #10197Adam Gamble2013-04-241-0/+56
| | |
* | | Revert "Revert "`belongs_to :touch` behavior now touches old association ↵Andrew White2013-04-243-1/+78
| |/ |/| | | | | | | | | | | | | | | when transitioning to new association" until a proper fix is found for #10197" This reverts commit 7389df139a35436f00876c96d20e81ba23c93f0a. Conflicts: activerecord/test/cases/timestamp_test.rb
* | Merge pull request #10324 from prijutme4ty/guides_fixXavier Noria2013-04-241-1/+1
|\ \ | | | | | | fixed missing comma in example
| * | fixed missing comma in exampleIlya Vorontsov2013-04-241-1/+1
|/ /
* / Add test for `format: false` with resources - closes #10323Andrew White2013-04-241-0/+29
|/
* Remove test case also related to the belongs_to touch featureDavid Heinemeier Hansson2013-04-231-20/+0
|
* Revert "`belongs_to :touch` behavior now touches old association when ↵David Heinemeier Hansson2013-04-233-58/+1
| | | | transitioning to new association" until a proper fix is found for #10197
* Merge pull request #10317 from arabonradar/ar_having_values_bug_fixRafael Mendonça França2013-04-232-1/+8
|\ | | | | ActiveRecord having clause bug fix
| * When empty options passed to having clause having_values was [nil] but ↵Fyodor2013-04-232-1/+8
| | | | | | | | should be empty.
* | Merge pull request #10318 from vipulnsward/refactor_obviousGuillermo Iguaran2013-04-231-4/+1
|\ \ | |/ |/| refactor initialization of array
| * refactor initialization of arrayVipul A M2013-04-231-4/+1
| |
* | Adjust for daylight savings in String#to_timeAndrew White2013-04-232-10/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes in b79adc4323 had a bug where if the time in the String was in standard time but the current time was in daylight savings then the calculated adjustment was off by an hour. This commit fixes this and adds extra tests for the following: * time in string is standard time, current time is standard time * time in string is standard time, current time is daylight savings * time in string is daylight savings, current time is standard time * time in string is daylight savings, current time is daylight savings Fixes #10306.
* | ActiveRecord -> Active RecordXavier Noria2013-04-222-1/+2
| |
* | applies documentation guidelinesXavier Noria2013-04-221-11/+12
| |
* | Merge pull request #10301 from vipulnsward/extract_in_mapperAndrew White2013-04-221-2/+4
|\ \ | |/ |/| extract arrays to constants in Mapper
| * extract arrays to constants in MapperVipul A M2013-04-221-2/+4
| |
* | Merge pull request #10302 from vipulnsward/remove_redundant_varCarlos Antonio da Silva2013-04-221-2/+0
|\ \ | | | | | | Remove redundant variable
| * | remove redundant variableVipul A M2013-04-221-2/+0
| |/
* | Merge pull request #10299 from econsultancy/use-method-not-allowed-exceptionAndrew White2013-04-224-0/+18
|\ \ | |/ |/| Use MethodNotAllowed exception rather than UnknownHttpMethod
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 15:58:04 +0000