| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | Fix deprecation message in test for Path#children | Carlos Antonio da Silva | 2012-10-29 | 1 | -1/+1 | |
| |/ / / | ||||||
| * | | | Add test to deprecation of Path#children | Rafael Mendonça França | 2012-10-29 | 1 | -0/+6 | |
| | | | | ||||||
| * | | | Merge pull request #7587 from elia/fix-too-eager-loading | Rafael Mendonça França | 2012-10-29 | 3 | -6/+17 | |
| | | | | | | | | | | | | | | | | | | | Should not eager_load app/assets Conflicts: railties/CHANGELOG.md | |||||
| * | | | Merge pull request #8027 from daenney/master | Xavier Noria | 2012-10-29 | 3 | -3/+12 | |
| |\ \ \ | | | | | | | | | Atomic.rb assumes it may chown/chmod a file but doesn't handle the EPERM error. | |||||
| | * | | | atomicc.rb: Don't assume we may chown/chmod a file. | Daniele Sluijters | 2012-10-29 | 3 | -3/+12 | |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously this code just assumed it is capable of changing the file ownership, both user and group. This will fail in a lot of scenario's unless: * The process is run as a superuser (root); * The owning user and group are already set to the user and group we're trying to chown to; * The user chown'ing only changes the group to another group it is a member of. If either of those conditions are not met the filesystem will simply deny the operation throwing an error. It is also not always possible to do a chmod, there might be a SELinux policy or another limitation preventing the user to change the file mode. To this end the chmod call has also been added to the rescue block. I've also added a little comment above the chmod command that doing a chmod on a file which has an ACL set will cause the ACL to be recalculated / modified. | |||||
| * | | | Fix the skip code. | Rafael Mendonça França | 2012-10-28 | 1 | -4/+4 | |
| | | | | | | | | | | | | | Checking for the constant doesn't work | |||||
| * | | | Merge pull request #8057 from frodsan/fix_sqlite_mutate_arg | Rafael Mendonça França | 2012-10-28 | 2 | -1/+7 | |
| |\ \ \ | | | | | | | | | SQLite3Adapter#type_cast should not mutate arguments | |||||
| | * | | | SQLite3Adapter#type_cast should not mutate arguments | Stefan Rusterholz | 2012-10-28 | 2 | -1/+7 | |
| |/ / / | ||||||
| * | | | Merge pull request #7750 from xuanxu/none_modificating_relation_in_place | Rafael Mendonça França | 2012-10-28 | 4 | -0/+25 | |
| |\ \ \ | | | | | | | | | Added ActiveRecord::Relation#none! method | |||||
| | * | | | ActiveRecord::Relation#none! method. | Juanjo Bazán | 2012-10-28 | 3 | -0/+16 | |
| | | | | | ||||||
| | * | | | loaded relations cannot be mutated by extending! | Juanjo Bazán | 2012-10-28 | 1 | -0/+9 | |
| |/ / / | ||||||
| * | | | Merge pull request #8053 from henrik/update_columns_with_primary_key | Carlos Antonio da Silva | 2012-10-28 | 3 | -1/+20 | |
| |\ \ \ | | | | | | | | | Unbreak update_column/update_columns for the primary key attribute. | |||||
| | * | | | Enable update_column(s) for the primary key attribute. | Henrik N | 2012-10-28 | 3 | -1/+20 | |
| |/ / / | | | | | | | | | | Didn't work before because it updated the model-in-memory first, so the DB query couldn't find the record. | |||||
| * | | | Merge pull request #8046 from pmahoney/exceptions_as_flow_control | Rafael Mendonça França | 2012-10-28 | 1 | -2/+2 | |
| |\ \ \ | | | | | | | | | Replace flow-control exception with explicit test. | |||||
| | * | | | Replace flow-control exception with explicit test. | Patrick Mahoney | 2012-10-27 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was noticed while profiling 'assets:precompile' in JRuby that exception creation was consuming a large portion of time, and some of that was due to File.atomic_write. Testing first with File.exists? eliminates the need for an exception which should be a perfomrance improvement on both JRuby and MRI. In this case, the stat() isn't even extra overhead, since it is always called. | |||||
| * | | | | Merge pull request #8048 from senny/7761_dont_render_view_without_mail_call | Rafael Mendonça França | 2012-10-28 | 5 | -1/+28 | |
| |\ \ \ \ | | | | | | | | | | | Do not render views when mail() isn't called. (NullMail refactoring) | |||||
| | * | | | | Do not render views when mail() isn't called. (NullMail refactoring) | Yves Senn | 2012-10-28 | 5 | -1/+28 | |
| | |/ / / | ||||||
| * | | | | Merge pull request #8047 from arunagw/json_only_in_18 | Carlos Antonio da Silva | 2012-10-28 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | | Removing JSON for other ruby | |||||
| * | | | | Fix some assert_raise calls containing messages in Active Support | Carlos Antonio da Silva | 2012-10-28 | 2 | -7/+15 | |
| | | | | | ||||||
| * | | | | Merge pull request #8054 from ↵ | Carlos Antonio da Silva | 2012-10-28 | 5 | -6/+45 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | senny/6378_create_table_raises_when_defining_pk_column create_table raises an ArgumentError when the primary key is redefined. | |||||
| | * | | | | raise `ArgumentError` when redefining the primary key column. Closes #6378 | Yves Senn | 2012-10-28 | 3 | -0/+34 | |
| | | | | | | ||||||
| | * | | | | refactor `SQLite3Adapter#copy_table` to prevent primary key redefinitions. #6378 | Yves Senn | 2012-10-28 | 2 | -6/+11 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #8056 from frodsan/fix_issue_missing_attribute | Rafael Mendonça França | 2012-10-28 | 3 | -3/+38 | |
| |\ \ \ \ | | | | | | | | | | | AR::AttributeMethods#[] raises AM::AttributeMissingError for missing attributes | |||||
| | * | | | | AR::AttributeMethods#[] raises AM::AttributeMissingError for missing attributes. | Francesco Rodriguez | 2012-10-28 | 3 | -3/+38 | |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the following behaviour: class Person < ActiveRecord::Base belongs_to :company end # Before: person = Person.select('id').first person[:name] # => nil person.name # => ActiveModel::MissingAttributeError: missing_attribute: name person[:company_id] # => nil person.company # => nil # After: person = Person.select('id').first person[:name] # => ActiveModel::MissingAttributeError: missing_attribute: name person.name # => ActiveModel::MissingAttributeError: missing_attribute: name person[:company_id] # => ActiveModel::MissingAttributeError: missing_attribute: company_id person.company # => ActiveModel::MissingAttributeError: missing_attribute: company_id Fixes #5433. | |||||
| * | | | | Merge pull request #8052 from schneems/schneems/silence-ar-query-in-middleware | Rafael Mendonça França | 2012-10-28 | 1 | -1/+3 | |
| |\ \ \ \ | | | | | | | | | | | Don't log on pending migration check | |||||
| | * | | | | Don't log on pending migration check | schneems | 2012-10-28 | 1 | -1/+3 | |
| |/ / / / | | | | | | | | | | | | | | | | | Conversation from: #6665 cc/ @rafaelfranca | |||||
| * | | | | Add syntax highlight to code blocks in javascript guide [ci skip] | Carlos Antonio da Silva | 2012-10-28 | 1 | -27/+25 | |
| | | | | | ||||||
| * | | | | Add backticks around link_to example in javascript guide [ci skip] | Carlos Antonio da Silva | 2012-10-28 | 2 | -1/+3 | |
| | | | | | ||||||
| * | | | | Merge pull request #8050 from bashmish/master | Carlos Antonio da Silva | 2012-10-28 | 1 | -0/+1 | |
| |\ \ \ \ | |/ / / |/| | | | fix typo in button_to helper example [ci skip] | |||||
| | * | | | fix typo in button_to helper example | Michael Bashkirov | 2012-10-28 | 1 | -0/+1 | |
| |/ / / | ||||||
| * | | | USe the released version of sprockets-rails in a new Rails 4 application | Rafael Mendonça França | 2012-10-27 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Merge pull request #7960 from pwnall/mysql_varbinary | Rafael Mendonça França | 2012-10-27 | 7 | -18/+71 | |
| |\ \ \ | | | | | | | | | Use the MySQL varbinary type when appropriate in migrations | |||||
| | * | | | Use the MySQL varbinary type when appropriate in migrations. | Victor Costan | 2012-10-27 | 7 | -18/+71 | |
| | | | | | ||||||
| * | | | | Improve the deprecation message of link_to_function and | Rafael Mendonça França | 2012-10-27 | 2 | -8/+10 | |
| |/ / / | | | | | | | | | | | | | | | | button_to_function Point the the Unobtrusive JavaScript secion in the JavaScript guide | |||||
| * | | | Merge pull request #8034 from gbchaosmaster/readme-format | Xavier Noria | 2012-10-27 | 2 | -19/+18 | |
| |\ \ \ | | | | | | | | | Organize README | |||||
| | * | | | Organize README | Vinny Diehl | 2012-10-26 | 2 | -19/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Organized code status badges into a "Code Status" section. * Moved the OSI MIT License link inline (bullets are for unordered lists). * Removed all EOL whitespace. [ci skip] | |||||
| * | | | | Add the Working with JavaScript Guides in the guides home as WIP | Rafael Mendonça França | 2012-10-27 | 1 | -29/+34 | |
| | | | | | ||||||
| * | | | | Merge pull request #8043 from senny/remove_trailing_whitespace_in_actionpack | Rafael Mendonça França | 2012-10-27 | 11 | -17/+17 | |
| |\ \ \ \ | | | | | | | | | | | remove trailing whitespace within actionpack [ci skip] | |||||
| | * | | | | cleanup, remove trailing whitespace within actionpack | Yves Senn | 2012-10-27 | 11 | -17/+17 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #8040 from frodsan/fix_build_isolated | Jeremy Kemper | 2012-10-26 | 1 | -0/+1 | |
| |\ \ \ \ | | | | | | | | | | | fix failing isolated tests in activemodel | |||||
| | * | | | | fix failing isolated tests | Francesco Rodriguez | 2012-10-26 | 1 | -0/+1 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #8038 from frodsan/fix_am_serializers_xml_dependency | Jeremy Kemper | 2012-10-26 | 5 | -6/+6 | |
| |\ \ \ \ | | | | | | | | | | | Fix AM::Serializers::Xml dependency | |||||
| | * | | | | fix AM::Serializers titles [ci skip] | Francesco Rodriguez | 2012-10-26 | 2 | -2/+2 | |
| | | | | | | ||||||
| | * | | | | AM::Serializers::Xml depends on AM::Naming | Francesco Rodriguez | 2012-10-26 | 4 | -4/+4 | |
| |/ / / / | ||||||
| * | | | | Fix queueing tests that should be consuming the queue rather than draining it | Jeremy Kemper | 2012-10-26 | 2 | -4/+10 | |
| | | | | | ||||||
| * | | | | Job consumer logs to Rails.logger by default | Jeremy Kemper | 2012-10-26 | 3 | -2/+7 | |
| | | | | | ||||||
| * | | | | Job worker thread logs failed jobs too | Jeremy Kemper | 2012-10-26 | 2 | -2/+2 | |
| | | | | | ||||||
| * | | | | Job worker thread logs to stderr if no logger is provided | Jeremy Kemper | 2012-10-26 | 2 | -2/+13 | |
| | | | | | ||||||
| * | | | | Merge pull request #7593 from veader/patch-1 | Rafael Mendonça França | 2012-10-26 | 3 | -1/+15 | |
| |\ \ \ \ | | | | | | | | | | | Decode attributes pulled from URI.parse | |||||
| | * | | | | Decode attributes pulled from URI.parse | Shawn Veader | 2012-10-26 | 3 | -1/+15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The RFC indicates that username and passwords may be encoded. http://tools.ietf.org/html/rfc2396#section-3.2.2 Found this trying to use the mysql://username:password@host:port/db and having special characters in the password which needed to be URI encoded. | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |