aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | just check pending migrations in the current environmentAaron Patterson2013-04-051-2/+2
| | | | |
| * | | | check pending migrations against the test dbAaron Patterson2013-04-032-26/+4
| | | | |
| * | | | only match the default taskAaron Patterson2013-04-031-1/+1
| | | | |
| * | | | test no longer makes sense after requiring all test filesAaron Patterson2013-04-031-23/+1
| | | | |
| * | | | switch the testing tests to use rakeAaron Patterson2013-04-031-20/+23
| | | | |
| * | | | a test file can be provided to rake, e.g.:Aaron Patterson2013-04-031-1/+10
| | | | | | | | | | | | | | | | | | | | rake test path/to/test.rb
| * | | | switch to Rails::TestTaskAaron Patterson2013-04-032-25/+34
| | | | |
| * | | | default task should also be in the test envAaron Patterson2013-04-031-1/+1
| | | | |
| * | | | ensure the schema checking is done in the dev connectionAaron Patterson2013-04-031-0/+8
| | | | |
| * | | | Revert "Update Rake tasks to call `rails test` instead"Aaron Patterson2013-04-032-41/+62
| | | | | | | | | | | | | | | | | | | | This reverts commit b51673fbd9563bd3ffa22e22255ca1cef80cfb6d.
| * | | | Revert "Warning removed unused variable task_name"Aaron Patterson2013-04-031-0/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit 106e15927f0dd8060fc37eff44b823a92fa94bd2.
| * | | | apps that depend on active record should load fixturesAaron Patterson2013-04-032-10/+2
| | | | |
* | | | | Merge pull request #10110 from choudhuryanupam/masterCarlos Antonio da Silva2013-04-052-2/+1
|\ \ \ \ \ | | | | | | | | | | | | Removed space and unused class
| * | | | | Removed space and unused classAnupam Choudhury2013-04-062-2/+1
| | | | | |
* | | | | | Merge pull request #10108 from choudhuryanupam/masterRafael Mendonça França2013-04-051-1/+0
|\| | | | | | | | | | | | | | | | | Removed unnecessary class
| * | | | | Removed unnecessary classAnupam Choudhury2013-04-061-1/+0
| | |/ / / | |/| | |
* | | | | Merge pull request #9555 from tmm1/optimize-erbRafael Mendonça França2013-04-052-3/+35
|\ \ \ \ \ | |/ / / / |/| | | | Optimize generated ERB to reduce method calls
| * | | | avoid extra method calls for appending newlinesAman Gupta2013-03-041-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before: ');@output_buffer.append= ( content_icon row[:content] );@output_buffer.safe_concat(' ');@output_buffer.safe_concat(' ');@output_buffer.append= ( spinner_img );@output_buffer.safe_concat(' ');@output_buffer.safe_concat(' </td> <td class="content"> ');@output_buffer.append= ( content_link row[:content] );@output_buffer.safe_concat(' ');@output_buffer.safe_concat(' </td> <td class="message"> '); after: ';@output_buffer.append=( content_icon row[:content] );@output_buffer.safe_append=' ';@output_buffer.append=( spinner_img );@output_buffer.safe_append=' </td> <td class="content"> ';@output_buffer.append=( content_link row[:content] );@output_buffer.safe_append=' </td> <td class="message"> ';
| * | | | Use ActionView::OutputBuffer#safe_append= from templatesAman Gupta2013-03-042-3/+9
| | | | |
* | | | | Improve the changelog entry [ci skip]Rafael Mendonça França2013-04-051-3/+4
| | | | |
* | | | | Merge pull request #10106 from rmm5t/fix-explicit-name-on-multiple-fields-masterRafael Mendonça França2013-04-053-8/+24
|\ \ \ \ \ | | | | | | | | | | | | Fix explicit names on multiple file fields
| * | | | | Fix explicit names on multiple file fieldsRyan McGeary2013-04-053-8/+24
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a file field tag is passed the multiple option, it is turned into an array field (appending "[]"), but if the file field is passed an explicit name as an option, leave the name alone (do not append "[]"). Fixes #9830
* | | | | Merge pull request #10098 from subwindow/postgres_dump_bigint_defaultRafael Mendonça França2013-04-054-1/+12
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Correctly parse bigint defaults in PostgreSQL Conflicts: activerecord/CHANGELOG.md
| * | | | Correctly parse bigint defaults in PostgreSQLErik Peterson2013-04-054-1/+12
| | | | |
* | | | | Move changelog to the top [ci skip]Carlos Antonio da Silva2013-04-051-17/+17
| | | | |
* | | | | Fix indent and remove extra white spacesCarlos Antonio da Silva2013-04-051-15/+17
| | | | |
* | | | | Merge pull request #9996 from mikz/masterJon Leighton2013-04-053-0/+34
|\ \ \ \ \ | | | | | | | | | | | | Association with inverse_of does not set the parent in association building block
| * | | | | fix inverse_of association in block of new childMichal Cichra2013-04-013-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes inconsistency when building children of association which has inverse_of set properly. When creating new association object with a block: parent.association.build do |child| child.parent.equal?(parent) # false end So the block the `child.parent` did not point to the same object. But when the object is created it points to same instance: child = parent.association.build child.parent.equal?(parent) # true
* | | | | | Merge pull request #10058 from jamesgolick/masterJon Leighton2013-04-052-5/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Avoid calling define_method in CollectionProxy#scope
| * | | | | | Refactor CollectionProxy#scope to avoid calling #extend.James Golick2013-04-022-5/+3
| | | | | | |
* | | | | | | Fix scope chaining + STIJon Leighton2013-04-054-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See #9869 and #9929. The problem arises from the following example: class Project < ActiveRecord::Base scope :completed, -> { where completed: true } end class MajorProject < Project end When calling: MajorProject.where(tasks_count: 10).completed This expands to: MajorProject.where(tasks_count: 10).scoping { MajorProject.completed } However the lambda for the `completed` scope is defined on Project. This means that when it is called, `self` is Project rather than MajorProject. So it expands to: MajorProject.where(tasks_count: 10).scoping { Project.where(completed: true) } Since the scoping was applied on MajorProject, and not Project, this fails to apply the tasks_count condition. The solution is to make scoping apply across STI classes. I am slightly concerned about the possible side-effects of this, but no tests fail and it seems ok. I guess we'll see.
* | | | | | | failing test for #9869Neeraj Singh2013-04-052-0/+6
| | | | | | |
* | | | | | | Merge pull request #10102 from xxxcaqui/masterCarlos Antonio da Silva2013-04-051-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Sort modules in active_record.rb
| * | | | | | | Sort modules in alphabetical order.Shunsuke Osa2013-04-051-2/+2
| | |_|/ / / / | |/| | | | |
* / | | | | | Improve `belongs_to touch: true` timestamp testAndrew White2013-04-051-7/+21
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Round off time to a whole second value to compensate for databases that don't support fractional timestamps. Also add a assertion to check that the old record is touched when the association is cleared.
* | | | | | Avoid an attempt to fetch old record when id was not present in touch callbackCarlos Antonio da Silva2013-04-041-7/+7
| | | | | |
* | | | | | Use the correct pk field from the reflected class to find the old recordCarlos Antonio da Silva2013-04-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation was using the source class foreign key field instead of the reflected primary key one to find the old record. For instance, for this scenario class Bulb < ActiveRecord::Base belongs_to :car, :touch => true end class Car < ActiveRecord::Base has_many :bulbs end the current implementation was trying to do this query: Car.where(car_id: X).first where we should be doing this query: Car.where(id: X).first This should hopefully fix the build.
* | | | | | Refactor mail_to to not generate intermediate hashes when adding hrefCarlos Antonio da Silva2013-04-041-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no need to use Hash#merge with a new hash just for setting the href option to pass it through. Since we're always dealing with a new html_options hash, we're free to just set the value instead.
* | | | | | Ensure mail_to helper does not modify the given html options hashCarlos Antonio da Silva2013-04-042-4/+10
| | | | | |
* | | | | | Merge pull request #10065 from spohlenz/mail_to_blockCarlos Antonio da Silva2013-04-043-5/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add block support for the mail_to helper
| * | | | | | Add block support for the helperSam Pohlenz2013-04-033-5/+30
| | | | | | |
* | | | | | | Merge pull request #10092 from amco/masterCarlos Antonio da Silva2013-04-041-10/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Model generator USAGE doc improvement
| * | | | | | | Model generator USAGE doc improvedJason King2013-04-041-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added information about syntax for precision/scale of decimals * Removed incorrect information about being able to set `default` * Added more examples of usage
* | | | | | | | Use inspect when writing the foreign key from the reflectionAndrew White2013-04-052-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we don't use inspect inside the class_eval block then the foreign key is written without quotes causing us to fetch the foreign key value and not the column name.
* | | | | | | | Use a space after the comment sign when showing the result of commandsCarlos Antonio da Silva2013-04-041-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://guides.rubyonrails.org/api_documentation_guidelines.html#example-code [ci skip]
* | | | | | | | Merge pull request #10094 from neerajdotname/fix2Carlos Antonio da Silva2013-04-044-5/+23
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Collection of small fixes. Check individual commits for background.
| * | | | | | | | template should have generic nameNeeraj Singh2013-04-042-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since users just copy and paste and the class name is never changed
| * | | | | | | | use | to have more intent revealing codeNeeraj Singh2013-04-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | thanks to @egilburg for suggestion
| * | | | | | | | expanded rdoc for chain and reflection_namesNeeraj Singh2013-04-041-2/+20
| | | | | | | | |
* | | | | | | | | Merge pull request #10095 from frodsan/exclude_template_filesCarlos Antonio da Silva2013-04-041-1/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Exclude template files for rdoc API [ci skip]