Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Create default join table name using a Symbol | Carlos Antonio da Silva | 2012-07-19 | 1 | -1/+1 |
| | | | | | Lets stick with a symbol in join table name, it was removed in 993e1643650b7b0939437f86b7b4cda0d92b0b8f and broke the build. | ||||
* | Use attributes instead of table names in migration example | José Valim | 2012-07-19 | 1 | -1/+1 |
| | |||||
* | Merge pull request #7097 from lexmag/join_table_gen_attr | José Valim | 2012-07-18 | 5 | -8/+24 |
|\ | | | | | Add fkey attributes to `join_table` migration generator | ||||
| * | Add fkey attributes to `join_table` migration generator | Aleksey Magusev | 2012-07-19 | 5 | -8/+24 |
| | | |||||
* | | Revert "Merge pull request #7084 from LTe/logger_default_separator" | Aaron Patterson | 2012-07-18 | 2 | -14/+3 |
|/ | | | | | This reverts commit c08f30ff5fcda7e07cd9275a073acb2091e4b3f7, reversing changes made to e243a8a32eb4c8777f07ca4b974bd7e38d9477d3. | ||||
* | Merge pull request #7095 from davekaro/master | Rafael Mendonça França | 2012-07-18 | 3 | -7/+7 |
|\ | | | | | revert Default timestamps to non-null | ||||
| * | revert Default timestamps to non-null | Dave Kroondyk | 2012-07-18 | 3 | -7/+7 |
|/ | | | | | | | Commit 3dbedd2 added NOT NULL constraints to timestamps. Commit fcef728 started to revert this, but was incomplete. With this commit, 3dbedd2 should be fully reverted and timestamps will no longer default to NOT NULL. | ||||
* | Merge pull request #6614 from carlosgaldino/data-confirm | Rafael Mendonça França | 2012-07-18 | 11 | -74/+58 |
|\ | | | | | Remove `:confirm` in favor of `:data => { :confirm => 'Text' }` option | ||||
| * | Remove `:confirm` in favor of `:data => { :confirm => 'Text' }` option | Carlos Galdino | 2012-07-18 | 11 | -74/+58 |
|/ | | | | | | | | | This applies to the following helpers: `button_to` `button_tag` `image_submit_tag` `link_to` `submit_tag` | ||||
* | Merge pull request #7084 from LTe/logger_default_separator | José Valim | 2012-07-18 | 2 | -3/+14 |
|\ | | | | | Don't use default separator in tagged logger | ||||
| * | Don't use default separator | Piotr Niełacny | 2012-07-18 | 2 | -3/+14 |
| | | | | | | | | When the default separator is set logger will create incorrect output | ||||
* | | Update changelog for migration generator change | José Valim | 2012-07-18 | 1 | -0/+7 |
| | | |||||
* | | Merge pull request #7082 from jalkoby/lazy_lookup_in_abstract_controller | José Valim | 2012-07-18 | 2 | -1/+20 |
|\ \ | |/ |/| | add lazy look up in abstract controller's translate method | ||||
| * | add lazy look up in abstract controller's translate method | Sergey Pchelincev | 2012-07-18 | 2 | -1/+20 |
|/ | |||||
* | Merge pull request #7028 from lexmag/join_table_indexes | José Valim | 2012-07-18 | 7 | -16/+66 |
|\ | | | | | Add indexes to create_join_table method | ||||
| * | Add join table migration generator | Aleksey Magusev | 2012-07-18 | 7 | -16/+66 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | For instance, running rails g migration CreateMediaJoinTable artists musics:uniq will create a migration with create_join_table :artists, :musics do |t| # t.index [:artist_id, :music_id] t.index [:music_id, :artist_id], unique: true end | ||||
* | | Merge pull request #6626 from route/render_formats | José Valim | 2012-07-17 | 12 | -4/+33 |
|\ \ | | | | | | | Add additional formats to lookup context | ||||
| * | | Common behavior with adding formats to lookup_context for TemplateRenderer ↵ | Dmitry Vorotilin | 2012-07-18 | 12 | -4/+33 |
|/ / | | | | | | | and PartialRenderer | ||||
* | | Merge pull request #7081 from jfirebaugh/to_param_regression_master | Jon Leighton | 2012-07-17 | 2 | -1/+7 |
|\ \ | | | | | | | AR::Integration must be included after AM::Conversion | ||||
| * | | AR::Integration must be included after AM::Conversion | John Firebaugh | 2012-07-17 | 2 | -1/+7 |
|/ / | | | | | | | | | | | | | Integration's definition of #to_param must override Conversion's. Otherwise, there is a regression from 3.1 in the behavior of a non-persisted AR::Base instance which nevertheless has an id. | ||||
* | | Add support for optional root segments containing slashes | Andrew White | 2012-07-17 | 2 | -1/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optional segments with a root scope need to have the leading slash outside of the parentheses, otherwise the generated url will be empty. However if the route has non-optional elements then the leading slash needs to remain inside the parentheses otherwise the generated url will have two leading slashes, e.g: Blog::Application.routes.draw do get '/(:category)', :to => 'posts#index', :as => :root get '/(:category)/author/:name', :to => 'posts#author', :as => :author end $ rake routes root GET /(:category)(.:format) posts#index author GET (/:category)/author/:name(.:format) posts#author This change adds support for optional segments that contain a slash, allowing support for urls like /page/2 for the root path, e.g: Blog::Application.routes.draw do get '/(page/:page)', :to => 'posts#index', :as => :root end $ rake routes root GET /(page/:page)(.:format) posts#index Fixes #7073 | ||||
* | | Merge pull request #7076 from kennyj/fix_class_eval | Aaron Patterson | 2012-07-17 | 5 | -6/+6 |
|\ \ | | | | | | | Fix class_eval without __FILE__ and __LINE__. | ||||
| * | | Fix class_eval without __FILE__ and __LINE__. | kennyj | 2012-07-18 | 5 | -6/+6 |
| | | | |||||
* | | | Merge pull request #7072 from beerlington/fix_validations_with_scope | Jon Leighton | 2012-07-17 | 2 | -1/+17 |
|\ \ \ | |/ / |/| | | Use database value for uniqueness validation scope | ||||
| * | | Fixes "Cannot visit ..." with validates_uniqueness_of | beerlington | 2012-07-17 | 2 | -1/+17 |
|/ / | | | | | | | | | | | Fixes issue with overrding ActiveRecord reader methods with a composed object and using that attribute as the scope of a validates_uniqueness_of validation. | ||||
* | | Merge pull request #7006 from jaredbeck/issue_7005_explain_asset_debug | Piotr Sarnacki | 2012-07-16 | 1 | -1/+1 |
|\ \ | | | | | | | A more informative comment for config.asset.debug | ||||
| * | | A more informative comment for config.asset.debug | Jared Beck | 2012-07-16 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #7066 from wkang/master | Rafael Mendonça França | 2012-07-16 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix activerecord model to_ary method comment 'see also' link | ||||
| * | | | Fix activerecord model to_ary method comment 'see also' link | Kang Wen | 2012-07-16 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-07-15 | 11 | -38/+218 |
|\ \ \ | |||||
| * | | | session_id column is string in default | kennyj | 2012-07-15 | 1 | -1/+1 |
| | | | | |||||
| * | | | add note about requiring gem dependencies before initialization [ci skip] | Francesco Rodriguez | 2012-07-13 | 1 | -6/+28 |
| | | | | |||||
| * | | | Added note about feature requests and rails-core list. | Steve Klabnik | 2012-07-13 | 1 | -0/+2 |
| | | | | |||||
| * | | | Updated with_routing example to 3.x syntax [ci skip] | Wojciech Wnętrzak | 2012-07-13 | 1 | -7/+4 |
| | | | | |||||
| * | | | Change Assertion language to Expected/Actual from obj1/obj2 | Scott Stewart | 2012-07-12 | 1 | -5/+5 |
| | | | | |||||
| * | | | Fixes typo in CommentsController#create example | Andy Lindeman | 2012-07-11 | 1 | -1/+1 |
| | | | | | | | | | | | | * comments.build will not actually persist the comment | ||||
| * | | | Fix typo | Chun-wei Kuo | 2012-07-11 | 1 | -1/+1 |
| | | | | |||||
| * | | | [getting started] update a code listing | Simon Hengel | 2012-07-10 | 1 | -0/+1 |
| | | | | |||||
| * | | | use 'use_zone' method in example, instead of reimplementing it | Jakub Kuźma | 2012-07-10 | 1 | -5/+5 |
| | | | | |||||
| * | | | Add info note about sass/coffeescript use in engine assets to guide | Marten Veldthuis | 2012-07-09 | 1 | -0/+2 |
| | | | | |||||
| * | | | Fixed second assert_match - previous one didn't make any sense (if the first ↵ | Jakub Kuźma | 2012-07-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | passed, the second passed as well) | ||||
| * | | | It's better to pass strings to assert_match - it converts them to regular ↵ | Jakub Kuźma | 2012-07-09 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | expressions, escaping special chars like '.'. It seems email.encoded contains some unexpected line breaks (due to encoding), it's better to assert_match email.body.to_s. | ||||
| * | | | Revert "Select missing formbuilder typo." | Dan Patrick | 2012-07-08 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | This reverts commit bf97795e7327e15774666d2197f1c0b8ada57a84. | ||||
| * | | | Select missing formbuilder typo. | Dan Patrick | 2012-07-08 | 1 | -2/+2 |
| | | | | |||||
| * | | | Document building complex forms using accepts_nested_attributes_for | Frederick Cheung | 2012-07-08 | 1 | -8/+127 |
| | | | | |||||
| * | | | Add docs for having, lock and readonly | Oscar Del Ben | 2012-07-07 | 1 | -0/+12 |
| | | | | |||||
| * | | | Add doc for joins and improve includes doc | Oscar Del Ben | 2012-07-07 | 1 | -2/+17 |
| | | | | |||||
| * | | | Add docs for eager_laod and preload | Oscar Del Ben | 2012-07-07 | 1 | -0/+10 |
| | | | | |||||
* | | | | adds a missing require [fixes #6896] | Xavier Noria | 2012-07-15 | 2 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | This file uses Time.zone, which is defined in active_support/core_ext/time/zones.rb. | ||||
* | | | | Merge pull request #7057 from kennyj/fix_sql_bypass_problem | Rafael Mendonça França | 2012-07-14 | 2 | -1/+15 |
|\ \ \ \ | | | | | | | | | | | Fix SqlBypass.data_column problem. |