aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* atomicc.rb: Don't assume we may chown/chmod a file.Daniele Sluijters2012-10-293-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ça2012-10-281-4/+4
| | | | Checking for the constant doesn't work
* Merge pull request #8057 from frodsan/fix_sqlite_mutate_argRafael Mendonça França2012-10-282-1/+7
|\ | | | | SQLite3Adapter#type_cast should not mutate arguments
| * SQLite3Adapter#type_cast should not mutate argumentsStefan Rusterholz2012-10-282-1/+7
|/
* Merge pull request #7750 from xuanxu/none_modificating_relation_in_placeRafael Mendonça França2012-10-284-0/+25
|\ | | | | Added ActiveRecord::Relation#none! method
| * ActiveRecord::Relation#none! method.Juanjo Bazán2012-10-283-0/+16
| |
| * loaded relations cannot be mutated by extending!Juanjo Bazán2012-10-281-0/+9
|/
* Merge pull request #8053 from henrik/update_columns_with_primary_keyCarlos Antonio da Silva2012-10-283-1/+20
|\ | | | | Unbreak update_column/update_columns for the primary key attribute.
| * Enable update_column(s) for the primary key attribute.Henrik N2012-10-283-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_controlRafael Mendonça França2012-10-281-2/+2
|\ | | | | Replace flow-control exception with explicit test.
| * Replace flow-control exception with explicit test.Patrick Mahoney2012-10-271-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_callRafael Mendonça França2012-10-285-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 Senn2012-10-285-1/+28
| |/
* | Merge pull request #8047 from arunagw/json_only_in_18Carlos Antonio da Silva2012-10-281-1/+0
| | | | | | | | Removing JSON for other ruby
* | Fix some assert_raise calls containing messages in Active SupportCarlos Antonio da Silva2012-10-282-7/+15
| |
* | Merge pull request #8054 from ↵Carlos Antonio da Silva2012-10-285-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 #6378Yves Senn2012-10-283-0/+34
| | |
| * | refactor `SQLite3Adapter#copy_table` to prevent primary key redefinitions. #6378Yves Senn2012-10-282-6/+11
|/ /
* | Merge pull request #8056 from frodsan/fix_issue_missing_attributeRafael Mendonça França2012-10-283-3/+38
|\ \ | | | | | | AR::AttributeMethods#[] raises AM::AttributeMissingError for missing attributes
| * | AR::AttributeMethods#[] raises AM::AttributeMissingError for missing attributes.Francesco Rodriguez2012-10-283-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-middlewareRafael Mendonça França2012-10-281-1/+3
|\ \ | | | | | | Don't log on pending migration check
| * | Don't log on pending migration check schneems2012-10-281-1/+3
|/ / | | | | | | | | Conversation from: #6665 cc/ @rafaelfranca
* | Add syntax highlight to code blocks in javascript guide [ci skip]Carlos Antonio da Silva2012-10-281-27/+25
| |
* | Add backticks around link_to example in javascript guide [ci skip]Carlos Antonio da Silva2012-10-282-1/+3
| |
* | Merge pull request #8050 from bashmish/masterCarlos Antonio da Silva2012-10-281-0/+1
|\ \ | |/ |/| fix typo in button_to helper example [ci skip]
| * fix typo in button_to helper exampleMichael Bashkirov2012-10-281-0/+1
|/
* USe the released version of sprockets-rails in a new Rails 4 applicationRafael Mendonça França2012-10-271-1/+1
|
* Merge pull request #7960 from pwnall/mysql_varbinaryRafael Mendonça França2012-10-277-18/+71
|\ | | | | Use the MySQL varbinary type when appropriate in migrations
| * Use the MySQL varbinary type when appropriate in migrations.Victor Costan2012-10-277-18/+71
| |
* | Improve the deprecation message of link_to_function andRafael Mendonça França2012-10-272-8/+10
|/ | | | | | button_to_function Point the the Unobtrusive JavaScript secion in the JavaScript guide
* Merge pull request #8034 from gbchaosmaster/readme-formatXavier Noria2012-10-272-19/+18
|\ | | | | Organize README
| * Organize READMEVinny Diehl2012-10-262-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 WIPRafael Mendonça França2012-10-271-29/+34
| |
* | Merge pull request #8043 from senny/remove_trailing_whitespace_in_actionpackRafael Mendonça França2012-10-2711-17/+17
|\ \ | | | | | | remove trailing whitespace within actionpack [ci skip]
| * | cleanup, remove trailing whitespace within actionpackYves Senn2012-10-2711-17/+17
|/ /
* | Merge pull request #8040 from frodsan/fix_build_isolatedJeremy Kemper2012-10-261-0/+1
|\ \ | | | | | | fix failing isolated tests in activemodel
| * | fix failing isolated testsFrancesco Rodriguez2012-10-261-0/+1
|/ /
* | Merge pull request #8038 from frodsan/fix_am_serializers_xml_dependencyJeremy Kemper2012-10-265-6/+6
|\ \ | | | | | | Fix AM::Serializers::Xml dependency
| * | fix AM::Serializers titles [ci skip]Francesco Rodriguez2012-10-262-2/+2
| | |
| * | AM::Serializers::Xml depends on AM::NamingFrancesco Rodriguez2012-10-264-4/+4
|/ /
* | Fix queueing tests that should be consuming the queue rather than draining itJeremy Kemper2012-10-262-4/+10
| |
* | Job consumer logs to Rails.logger by defaultJeremy Kemper2012-10-263-2/+7
| |
* | Job worker thread logs failed jobs tooJeremy Kemper2012-10-262-2/+2
| |
* | Job worker thread logs to stderr if no logger is providedJeremy Kemper2012-10-262-2/+13
| |
* | Merge pull request #7593 from veader/patch-1Rafael Mendonça França2012-10-263-1/+15
|\ \ | | | | | | Decode attributes pulled from URI.parse
| * | Decode attributes pulled from URI.parseShawn Veader2012-10-263-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.
* | | Merge pull request #7971 from dgraham/hash-replaceRafael Mendonça França2012-10-263-0/+22
|\ \ \ | |/ / |/| | Implement HashWithIndifferentAccess#replace so key? works correctly.
| * | Implement replace method so key? works correctly.David Graham2012-10-263-0/+22
|/ /
* | remove unused config optionJon Leighton2012-10-261-3/+0
| |
* | Remove ActiveRecord::Model entry from 4.0 Release Notes [ci skip]Carlos Antonio da Silva2012-10-261-8/+0
| |