| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | | Merge pull request #9930 from kennyj/bump_tzinfo | Santiago Pastorino | 2013-03-25 | 2 | -2/+2 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Bump TZInfo version to 0.3.37 based on version v2013b of the underlying tz data. | |||||
| | * | | | | | | Bump TZInfo version to 0.3.37 based on version v2013b of the underlying tz data. | kennyj | 2013-03-26 | 2 | -2/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | default RAILS_ENV to test if we're in a test task | Aaron Patterson | 2013-03-25 | 1 | -0/+4 | |
| | |/ / / / / |/| | | | | | ||||||
| * | | | | | | Fix typo | Rafael Mendonça França | 2013-03-25 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #9925 from senny/relative_guide_links | Steve Klabnik | 2013-03-25 | 3 | -18/+26 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | use relative links inside guides [ci skip] | |||||
| | * | | | | | | use relative links inside guides [ci skip] | Yves Senn | 2013-03-25 | 3 | -18/+26 | |
| | | | | | | | | ||||||
| * | | | | | | | The sql_type method called here is from | Rafael Mendonça França | 2013-03-25 | 2 | -7/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveRecord::ConnectionAdapters::Column See https://github.com/rails/rails/blob/28b8ca766e3e7c6c43d3ae900c99f8377153c62/activerecord/lib/active_record/connection_adapters/column.rb#L16 | |||||
| * | | | | | | | Merge pull request #9920 from senny/clean_up_testing_examples_for_action_mailer | Steve Klabnik | 2013-03-25 | 2 | -36/+26 | |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | move mailer testing examples into the testing guide. | |||||
| | * | | | | | | move mailer testing examples into the testing guide. | Yves Senn | 2013-03-25 | 2 | -36/+26 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #9325. I adjusted the example and the description in the testing guide and simply linked from the mailer to the testing guide. This way we don't have to maintain two separate places. | |||||
| * | | | | | | | Merge pull request #7324 from MSch/pg-geometric | Rafael Mendonça França | 2013-03-25 | 6 | -12/+77 | |
| |\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Add support for pg geometric datatypes point and box | |||||
| | * | | | | | | Move away from column.sql_type in untested code too | Martin Schürrer | 2013-03-25 | 1 | -5/+6 | |
| | | | | | | | | ||||||
| | * | | | | | | Make Postgres point type correspond to ruby array with two floats inside | Martin Schürrer | 2013-03-25 | 6 | -8/+72 | |
| |/ / / / / / | ||||||
| * | | | | | | Created a layer of abstraction for the valid type checking in schema dumper. ↵ | Ranjay Krishna | 2013-03-25 | 7 | -1/+40 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Now, connection handles the check for valid types so that each database can handle the changes individually. | |||||
| * | | | | | | Merge pull request #9874 from arunagw/skipping-test-for-openssl-pkcs5 | Rafael Mendonça França | 2013-03-25 | 1 | -0/+10 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Skipping test for OpenSSL::PKCS5 JRuby | |||||
| | * | | | | | | Skipping test for OpenSSL::PKCS5 JRuby | Arun Agrawal | 2013-03-25 | 1 | -0/+10 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge pull request #8527 from shockone/patch-1 | Rafael Mendonça França | 2013-03-25 | 3 | -0/+39 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add a method full_messages_for to the Errors class | |||||
| | * | | | | | | | Add a method full_messages_for to the Errors class | shock_one | 2013-03-24 | 3 | -0/+39 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge pull request #9864 from vipulnsward/fix_test_AR_v2 | Rafael Mendonça França | 2013-03-25 | 3 | -2/+3 | |
| |\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | Introduce test on Error#full_message for attribute with underscores; Fix... | |||||
| | * | | | | | | | Add Error#full_message test; Fix typos | Vipul A M | 2013-03-22 | 3 | -2/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce test on Error#full_message for attribute with underscores; Fix some typos | |||||
| * | | | | | | | | Merge pull request #9918 from prathamesh-sonpatki/railties-typos | Steve Klabnik | 2013-03-25 | 2 | -2/+2 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fixed typo in railties/test | |||||
| | * | | | | | | | | Fixed typo in railties/test | Prathamesh Sonpatki | 2013-03-25 | 2 | -2/+2 | |
| | | |_|/ / / / / | |/| | | | | | | ||||||
| * | | | | | | | | Merge pull request #9916 from ↵ | Rafael Mendonça França | 2013-03-25 | 1 | -4/+2 | |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | neerajdotname/no-exception-when-cookie-is-tampered-with nil is retuned if cookie is tampered with [ci skip] | |||||
| | * | | | | | | | if cookie is tampered with then nil is returned [ci skip] | Neeraj Singh | 2013-03-25 | 1 | -4/+2 | |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if the given key is not found then verifier does raise `ActiveSupport::MessageVerifier::InvalidSignature` exception but this exception is resuced and finally nil is returned. | |||||
| * | | | | | | | Merge pull request #9914 from prathamesh-sonpatki/controller-pluralize | Xavier Noria | 2013-03-25 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Controller name pluralized | |||||
| | * | | | | | | | Controller name pluralized | Prathamesh Sonpatki | 2013-03-25 | 1 | -2/+2 | |
| |/ / / / / / / | ||||||
| * | | | | | | | Fix jquery-as-default test to account for switch from gem to github source ↵ | Jeremy Kemper | 2013-03-25 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in #9904 | |||||
| * | | | | | | | Update tests for #9704, named route collisions | Jeremy Kemper | 2013-03-24 | 2 | -6/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix named route collision in mount test fixture * Update controller named route precedence test | |||||
| * | | | | | | | Tender love for #9909 :heart: | Jeremy Kemper | 2013-03-24 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge pull request #9909 from trevorturk/9740 | Jeremy Kemper | 2013-03-24 | 5 | -100/+171 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Transparently upgrade signed cookies when setting secret_key_base | |||||
| | * | | | | | | | Introduce UpgradeLegacySignedCookieJar to transparently upgrade existing ↵ | Trevor Turk | 2013-03-24 | 5 | -100/+171 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | signed cookies generated by Rails 3 to avoid invalidating them when upgrading to Rails 4 | |||||
| * | | | | | | | | Merge pull request #9881 from gkop/master | Jeremy Kemper | 2013-03-24 | 3 | -16/+43 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Support .js.coffee views by default | |||||
| | * | | | | | | | | Put coffee-rails in top-level of generated Gemfile | Gabe Kopley | 2013-03-24 | 3 | -16/+43 | |
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | v3 of pull request based on additional feedback from @jeremy | |||||
| * | | | | | | | | Merge pull request #9912 from rwz/jbuilder-bump | Guillermo Iguaran | 2013-03-24 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Relaxed jbuilder dependency and bumped version number | |||||
| | * | | | | | | | Relaxed jbuilder dependency and bumped version number | Pavel Pravosud | 2013-03-25 | 1 | -1/+1 | |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | Newer version contains some generator bugfixes | |||||
| * | | | | | | | Merge pull request #9489 from obrie/fix/overridden_defaults_changed_attributes | Jeremy Kemper | 2013-03-24 | 2 | -3/+19 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix ActiveRecord locking column defaults not getting persisted | |||||
| | * | | | | | | | Fix ActiveRecord locking column defaults not getting persisted | Aaron Pfeifer | 2013-03-18 | 2 | -3/+19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When partial inserts are enabled, overridden db defaults are ignored. This results in locking columns having a nil value for new records if the db default is null. This happens because the list of changed attributes for new records is always assumed to be empty. Solution: When a new record's default attributes are set, also initialize the list of changed attributes by comparing current values against what's stored as the column defaults in the database. | |||||
| * | | | | | | | | Merge pull request #9704 from trevorturk/warn-about-skipped-routes | Jeremy Kemper | 2013-03-24 | 4 | -35/+34 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Raise an ArgumentError when a clashing named route is defined | |||||
| | * | | | | | | | | Tweak exception message to avoid giving potentially misleading suggestions | Trevor Turk | 2013-03-20 | 1 | -2/+3 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Raise an ArgumentError when a clashing named route is defined | Trevor Turk | 2013-03-19 | 4 | -35/+33 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #9905 from docunext/master | Carlos Antonio da Silva | 2013-03-24 | 1 | -3/+3 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | ActiveSupport::MessageVerifier: Updated docs due to removal of serializer accessor | |||||
| | * | | | | | | | | | Updated docs due to removal of serializer accessor | Albert Lash | 2013-03-24 | 1 | -3/+3 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Merge pull request #9904 from rubys/jquery-rails-github | Guillermo Iguaran | 2013-03-24 | 1 | -1/+3 | |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | Use jquery-rails from github | |||||
| | * | | | | | | | | | Use jquery-rails from github | Sam Ruby | 2013-03-24 | 1 | -1/+3 | |
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | completes https://github.com/rails/rails/commit/6f3f0f86332004fcee5c2f05d52bbff08c22f980 | |||||
| * | | | | | | | | | Merge pull request #9902 from robertomiranda/fix-release-task | Guillermo Iguaran | 2013-03-24 | 1 | -14/+2 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix update_version_rb task | |||||
| | * | | | | | | | | | Fix update_version_rb task | robertomiranda | 2013-03-24 | 1 | -14/+2 | |
| | | |_|_|/ / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #9901 from vipulnsward/fix_some_typos | Vijay Dev | 2013-03-24 | 5 | -5/+5 | |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | Fix some typos | |||||
| | * | | | | | | | | Fix some typos | Vipul A M | 2013-03-24 | 5 | -5/+5 | |
| |/ / / / / / / / | ||||||
| * | | | | | | | | Fix test: ActiveSupport.version is returning now a Gem::Version instead of a ↵ | Guillermo Iguaran | 2013-03-24 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | String | |||||
| * | | | | | | | | Use jquery-rails from github (fix Gem::Version error) | Guillermo Iguaran | 2013-03-23 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Ignore all pkg folders (including also top level one) | Guillermo Iguaran | 2013-03-23 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |