Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Unindent attributes iteration in scaffold index template | Carlos Antonio da Silva | 2013-04-18 | 1 | -2/+2 |
| | | | | | | | | | | Otherwise we get extra indent for the <td> elements due to the extra spaces at the beginning of the lines, like this: <tr> <td><%= author.name %></td> <td><%= link_to 'Show', author %></td> <td><%= link_to 'Edit', edit_author_path(author) %></td> | ||||
* | Indent around the scaffold loop | David Heinemeier Hansson | 2013-04-18 | 1 | -8/+8 |
| | |||||
* | HTML5 breaks | David Heinemeier Hansson | 2013-04-18 | 2 | -4/+4 |
| | |||||
* | Better ordering | David Heinemeier Hansson | 2013-04-18 | 1 | -3/+3 |
| | |||||
* | Revert "Merge pull request #10043 from cconstantine/master" | Rafael Mendonça França | 2013-04-18 | 2 | -21/+0 |
| | | | | | | | This reverts commit 521035af530482d6d9ad2dae568eaeb0ab188e1c, reversing changes made to 222011dbee842bbc60d3aaaa3145356b90a30fd1. Reason: This broke the tests | ||||
* | Use sprockets-rails 2.0.0.rc4 | Guillermo Iguaran | 2013-04-18 | 1 | -1/+1 |
| | |||||
* | Use sass-rails 4.0.0.rc1 | Rafael Mendonça França | 2013-04-18 | 1 | -1/+1 |
| | |||||
* | Use the same uglifier version that the generated applications | Rafael Mendonça França | 2013-04-18 | 1 | -1/+1 |
| | |||||
* | Use latest coffee-rails release | Rafael Mendonça França | 2013-04-18 | 2 | -2/+2 |
| | |||||
* | Revert "sprockets 2.9.x doesn't work with uglifier 2.0 yet." | Rafael Mendonça França | 2013-04-18 | 1 | -2/+2 |
| | | | | | | | | | This reverts commit 575838795019f7402992e3bfa83a0c5048cf143d. Conflicts: railties/lib/rails/generators/app_base.rb Reason: sprockets 2.9.1 fixes this issue | ||||
* | Bump arel to 4.0.0 | Rafael Mendonça França | 2013-04-18 | 1 | -1/+1 |
| | |||||
* | Merge pull request #10043 from cconstantine/master | Rafael Mendonça França | 2013-04-18 | 2 | -0/+21 |
|\ | | | | | DB with postgres string array column doesn't load fixtures well | ||||
| * | Fix loading of string arrays in postgres | Chris Constantine | 2013-04-08 | 2 | -0/+21 |
| | | |||||
* | | Add CHANGELOG entries - closes #10180, #10185 | Andrew White | 2013-04-18 | 1 | -0/+10 |
| | | |||||
* | | Refactor ActionDispatch::Http::URL.build_host_url | Andrew White | 2013-04-18 | 2 | -20/+90 |
| | | | | | | | | | | Add support for extracting the port from the :host option and for removing the subdomain by using nil, false or ''. | ||||
* | | Add url generation tests for #10185 | Andrew White | 2013-04-18 | 1 | -0/+2 |
| | | |||||
* | | Duplicate options before mutating them | Andrew White | 2013-04-18 | 2 | -3/+5 |
| | | |||||
* | | Passing subdomain: '' to url_for removes the subdomain (instead of adding a ↵ | Derek Watson | 2013-04-18 | 4 | -1/+32 |
| | | | | | | | | | | | | leading .) Adding a boolean route constraint checks for presence/absence of request property | ||||
* | | Merge pull request #10262 from printercu/patch-3 | Rafael Mendonça França | 2013-04-18 | 2 | -0/+7 |
|\ \ | | | | | | | Avoid leak into controller's action_methods | ||||
| * | | Avoid leak into controller's action_methods | printercu | 2013-04-18 | 2 | -0/+7 |
|/ / | |||||
* | | Merge pull request #10258 from thenickcox/pending_migrations_plural | Rafael Mendonça França | 2013-04-18 | 1 | -3/+3 |
|\ \ | | | | | | | Fix subject-verb agreement in error msg (and other grammar stuff) | ||||
| * | | Fix subject-verb agreement in error msg (and other grammar stuff) | thenickcox | 2013-04-17 | 1 | -3/+3 |
| | | | |||||
* | | | Merge pull request #10259 from prathamesh-sonpatki/secure-engine-tests | Carlos Antonio da Silva | 2013-04-17 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Use secure source for rubygems in engine tests | ||||
| * | | | Use secure source for rubygems in engine tests | Prathamesh Sonpatki | 2013-04-18 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #10255 from ↵ | Carlos Antonio da Silva | 2013-04-17 | 1 | -18/+14 |
|\ \ \ | | | | | | | | | | | | | | | | | wangjohn/increment_or_decrement_refactoring_in_local_cache Refactoring increment and decrement in local cache | ||||
| * | | | The increment and decrement commands in the local cache are exactly the | wangjohn | 2013-04-17 | 1 | -18/+14 |
|/ / / | | | | | | | | | | same, so their logic is being refactored. | ||||
* | | | Merge pull request #10254 from wangjohn/refactoring_local_cache | Carlos Antonio da Silva | 2013-04-17 | 1 | -8/+6 |
|\ \ \ | | | | | | | | | Refactored the storage of a temporary version of the local cache. | ||||
| * | | | Refactored the storage of a temporary version of the local cache into | wangjohn | 2013-04-17 | 1 | -8/+6 |
|/ / / | | | | | | | | | | its own method. | ||||
* | | | activerecord-deprecated_finders 1.0.0 has a bug with has_many :through | Rafael Mendonça França | 2013-04-17 | 1 | -1/+1 |
| | | | | | | | | | | | | associations | ||||
* | | | Merge pull request #10252 from epiclabs/nodoc_registries | Rafael Mendonça França | 2013-04-17 | 2 | -4/+4 |
|\ \ \ | | | | | | | | | add :nodoc: mark to *Registry classes [ci skip] | ||||
| * | | | add :nodoc: mark to *Registry classes [ci skip] | Francesco Rodriguez | 2013-04-17 | 3 | -5/+5 |
| | | | | |||||
* | | | | Add nodoc to LocalCacheRegistry | Rafael Mendonça França | 2013-04-17 | 1 | -1/+1 |
|/ / / | | | | | | | [ci skip] | ||||
* | | | Merge pull request #10250 from wangjohn/local_cache_registry | Rafael Mendonça França | 2013-04-17 | 1 | -15/+32 |
|\ \ \ | | | | | | | | | Adding a local thread registry to store local caches. | ||||
| * | | | Adding a local thread registry to store local caches. | wangjohn | 2013-04-17 | 1 | -15/+32 |
| | | | | |||||
* | | | | adding a test for root path in the app | Aaron Patterson | 2013-04-17 | 1 | -0/+24 |
|/ / / | |||||
* | | | Don't need to add activerecord-deprecated_finders on edge and dev | Rafael Mendonça França | 2013-04-17 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | | | | | | applications This gem will not change often to explain it be included in the application Gemfile | ||||
* | | | Bump activerecord-deprecated_finders to 1.0.0 | Rafael Mendonça França | 2013-04-17 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #10249 from shime/descriptive_error_messages | Piotr Sarnacki | 2013-04-17 | 2 | -6/+8 |
|\ \ \ | | | | | | | | | more descriptive error messages for class attributes | ||||
| * | | | more descriptive NameError's messages for class attributes | Hrvoje Šimić | 2013-04-17 | 2 | -6/+8 |
|/ / / | |||||
* | | | Merge pull request #10239 from rubys/cache_entry_conversion_problems | Jeremy Kemper | 2013-04-16 | 2 | -52/+51 |
|\ \ \ | | | | | | | | | switch (and lazily convert) ivar names to 3.x | ||||
| * | | | switch (and lazily convert) ivar names to 3.x | Sam Ruby | 2013-04-16 | 2 | -52/+51 |
| | | | | |||||
* | | | | Merge pull request #10173 from nashby/element-attributes | Rafael Mendonça França | 2013-04-16 | 3 | -1/+13 |
|\ \ \ \ | | | | | | | | | | | options_from_collection_for_select helper takes html attributes | ||||
| * | | | | options_from_collection_for_select helper takes html attributes | Vasiliy Ermolovich | 2013-04-11 | 3 | -1/+13 |
| | | | | | | | | | | | | | | | | | | | | as the last element of the array | ||||
* | | | | | let EXPLAIN use a thread locals registry [John J. Wang & Xavier Noria] | Xavier Noria | 2013-04-16 | 5 | -46/+70 |
| |/ / / |/| | | | | | | | | | | | Closes #10198. | ||||
* | | | | fixes gemspec | Xavier Noria | 2013-04-16 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #8206 from kennyj/fix_7619-2 | Rafael Mendonça França | 2013-04-16 | 3 | -3/+15 |
|\ \ \ \ | | | | | | | | | | | Fix #7619. 0x prefix must be added when assigning hexadecimal string into bit column in Postgresql, because solving ambiguity. | ||||
| * | | | | Fix #7619. 0x prefix must be added when assigning hexadecimal string into ↵ | kennyj | 2013-04-17 | 3 | -3/+15 |
|/ / / / | | | | | | | | | | | | | bit column in Postgresql, because solving ambiguity. | ||||
* | | | | Ruby On Rails -> Ruby on Rails [ci skip] | Xavier Noria | 2013-04-16 | 1 | -1/+1 |
| | | | | |||||
* | | | | Copy-edits in the ActiveSupport::Subscriber documentation. | Rafael Mendonça França | 2013-04-16 | 1 | -6/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | Thank you @fxn :green_heart::yellow_heart::heart::purple_heart::blue_heart: [ci skip] | ||||
* | | | | Merge pull request #10218 from dasch/dasch/extract-subscriber-class | Rafael Mendonça França | 2013-04-16 | 3 | -43/+89 |
|\ \ \ \ | | | | | | | | | | | Extract a Subscriber base class from LogSubscriber |