aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* modernizes hash syntax in actionpackXavier Noria2016-08-0695-2062/+2062
|
* modernizes hash syntax in actioncableXavier Noria2016-08-061-2/+2
|
* applies new string literal convention to the rest of the projectXavier Noria2016-08-0615-149/+149
| | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* applies new string literal convention in the gemspecsXavier Noria2016-08-0610-166/+166
| | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* applies new string literal convention in GemfileXavier Noria2016-08-061-61/+61
| | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* applies new string literal convention in toolsXavier Noria2016-08-063-19/+19
| | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* applies new string literal convention in tasksXavier Noria2016-08-061-24/+24
| | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* applies new string literal convention in guidesXavier Noria2016-08-0615-160/+160
| | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* applies new string literal convention in ciXavier Noria2016-08-061-38/+38
| | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* applies new string literal convention in railties/testXavier Noria2016-08-0695-1595/+1595
| | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* applies new string literal convention in railties/libXavier Noria2016-08-06105-628/+628
| | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* applies new string literal convention in actioncable/testXavier Noria2016-08-0629-260/+260
| | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* applies new string literal convention in actioncable/libXavier Noria2016-08-0628-90/+90
| | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* applies new string literal convention in actionmailer/testXavier Noria2016-08-0617-257/+257
| | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* applies new string literal convention in actionmailer/libXavier Noria2016-08-0615-47/+47
| | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* applies new string literal convention in actionpack/testXavier Noria2016-08-06145-6003/+6003
| | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* applies new string literal convention in actionpack/libXavier Noria2016-08-0696-571/+571
| | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* applies new string literal convention in actionview/testXavier Noria2016-08-0657-1207/+1207
| | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* applies new string literal convention in actionview/libXavier Noria2016-08-0655-271/+271
| | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* applies new string literal convention in activejob/testXavier Noria2016-08-0647-279/+279
| | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* applies new string literal convention in activejob/libXavier Noria2016-08-0628-99/+99
| | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* applies new string literal convention in activemodel/testXavier Noria2016-08-0638-563/+563
| | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* applies new string literal convention in activemodel/libXavier Noria2016-08-0628-77/+77
| | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* applies new string literal convention in activerecord/testXavier Noria2016-08-06280-5678/+5678
| | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* applies new string literal convention in activerecord/libXavier Noria2016-08-06118-840/+840
| | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* applies new string literal convention in activesupport/testXavier Noria2016-08-06141-2632/+2632
| | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* applies new string literal convention in activesupport/libXavier Noria2016-08-06176-705/+705
| | | | | The current code base is not uniform. After some discussion, we have chosen to go with double quotes by default.
* adds a few cops and sortsXavier Noria2016-08-061-21/+48
|
* Merge pull request #25998 from kamipo/enum_with_alias_attributeEileen M. Uchitelle2016-08-062-5/+22
|\ | | | | Fix `enum` with `alias_attribute`
| * Fix `enum` with `alias_attribute`Ryuta Kamizono2016-07-312-5/+22
| | | | | | | | Fixes #25892.
* | Merge pull request #26023 from tekin/correct-acceptance-guidelinesEileen M. Uchitelle2016-08-061-1/+1
|\ \ | | | | | | Correct usage for acceptance validator in guide
| * | Correct usage for acceptance validator in guideTekin Suleyman2016-08-021-1/+1
| | |
* | | Merge pull request #26070 from claudiob/fix-404Claudio B2016-08-052-2/+2
|\ \ \ | | | | | | | | [ci skip] Fix broken URL in guides
| * | | [ci skip] Fix broken URL in guidesclaudiob2016-08-052-2/+2
|/ / /
* | | Merge pull request #25665 from kamipo/remove_unused_table_argEileen M. Uchitelle2016-08-051-5/+5
|\ \ \ | | | | | | | | Remove unused `table` arg for `UniquenessValidator#scope_relation`
| * | | Remove unused `table` arg for `UniquenessValidator#scope_relation`Ryuta Kamizono2016-07-181-5/+5
| | | |
* | | | Merge pull request #26051 from kamipo/make_name_and_binds_to_optional_argsEileen M. Uchitelle2016-08-053-6/+6
|\ \ \ \ | | | | | | | | | | Make `name` and `binds` to optional args for `exec_{insert,update,delete}`
| * | | | Make `name` and `binds` to optional args for `exec_{insert,update,delete}`Ryuta Kamizono2016-08-043-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `insert`, `update`, `delete`, and `exec_query` have a default value against `name` and `binds`. But `exec_insert`, `exec_update`, and `exec_delete` not have. It is an inconvenience and inconsistent.
* | | | | Fix GET JSON integration test request to use method overrideeileencodes2016-08-053-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a `GET` request is sent `as: :json` in an integration test the test should use Rack's method override to change to a post request so the paramters are included in the postdata. Otherwise it will not encode the parameters correctly for the integration test. Because integration test sets up it's own middleware, `Rack::MethodOverride` needs to be included in the integration tests as well. `headers ||= {}` was moved so that headers are never nil. They should default to a hash. Fixes #26033 [Eileen M. Uchitelle & Aaron Patterson]
* | | | | Add note about limitations of Windows Subsystem for LinuxAndrew White2016-08-051-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to the limited support for inotify (Microsoft/BashOnWindows#216) in WSL the best thing to do at moment is add a note about skipping spring and listen when generating your application in the Getting Started guide. [skip ci] Fixes #26054.
* | | | | Don't assume all hashes are from multiparameter assignment in `composed_of`Sean Griffin2016-08-054-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So this bug is kinda funky. The code path is basically "if we weren't passed an instance of the class we compose to, and we have a converter, call that". Ignoring the hash case for a moment, everything after that was roughly intended to be the "else" clause, meaning that we are expected to have an instance of the class we compose to. Really, we should be blowing up in that case, as we can give a much better error message than what they user will likely get (e.g. `NameError: No method first for String` or something). Still, Ruby is duck typed, so if the object you're assigning responds to the same methods as the type you compose to, knock yourself out. The hash case was added in 36e9be8 to remove a bunch of special cased code from multiparameter assignment. I wrongly assumed that the only time we'd get a hash there is in that case. Multiparameter assignment will construct a very specific hash though, where the keys are integers, and we will have a set of keys covering `1..part.size` exactly. I'm pretty sure this could actually be passed around as an array, but that's a different story. Really I should convert this to something like `class MultiParameterAssignment < Hash; end`, which I might do soon. However for a change that I'm willing to backport to 4-2-stable, this is what I want to go with for the time being. Fixes #25978
* | | | | Merge pull request #26059 from rails/rename-deadlock-detected-to-deadlockedDavid Heinemeier Hansson2016-08-045-8/+8
|\ \ \ \ \ | | | | | | | | | | | | The problem isn't the detection but the deadlock itself
| * | | | | Leave internal pgsql name intact as const referenceDavid Heinemeier Hansson2016-08-041-2/+2
| | | | | |
| * | | | | The problem isn't the detection but the deadlock itselfDavid Heinemeier Hansson2016-08-045-10/+10
| | | | | |
* | | | | | Offer invitations to use retry_on/discard_on for common casesDavid Heinemeier Hansson2016-08-041-0/+5
| |/ / / / |/| | | |
* | | | | Merge pull request #26049 from kamipo/add_gemfile_lockGuillermo Iguaran2016-08-031-0/+37
|\ \ \ \ \ | |/ / / / |/| | | | Add accidentally removed dependency in Gemfile.lock
| * | | | Add accidentally removed dependency in Gemfile.lockRyuta Kamizono2016-08-041-0/+37
|/ / / / | | | | | | | | | | | | Follow up to ca0b6d0d416776655ed7516ac18f126fbde5315a.
* | | | Guard against jobs that were persisted before we started counting executions ↵David Heinemeier Hansson2016-08-031-1/+3
| | | | | | | | | | | | | | | | by zeroing out nil counters
* | | | Don't require C dependencies on Windows/JRubySean Griffin2016-08-032-39/+2
| | | |
* | | | Add :weeks to the list of variable duration partsAndrew White2016-08-033-1/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since 434df00 week durations are no longer converted to days. This means we need to add :weeks to the parts that ActiveSupport::TimeWithZone will consider being of variable duration to take account of DST transitions. Fixes #26039.