aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* smooth move aaron.... :bomb:Aaron Patterson2015-08-201-2/+2
* point at rack masterAaron Patterson2015-08-206-31/+34
* Merge pull request #21306 from ronakjangir47/remove_mocha_actionmailerKasper Timm Hansen2015-08-204-55/+100
|\
| * Removed mocha from ActionMailerRonak Jangir2015-08-204-55/+100
* | Merge pull request #16245 from byroot/more-atomic-writeMatthew Draper2015-08-211-27/+29
|\ \
| * | File renaming should be the last operation of an atomic writeJean Boussier2015-08-201-27/+29
* | | Merge pull request #21310 from y-yagi/fix_file_pathYves Senn2015-08-201-1/+1
|\ \ \
| * | | fix path of annotations.rake [ci skip]yuuji.yaginuma2015-08-201-1/+1
|/ / /
* | | uniqueness validation raises error for persisted record without pk.Yves Senn2015-08-204-4/+39
* | | Merge pull request #21300 from jonahb/cacheYves Senn2015-08-201-1/+1
|\ \ \ | |_|/ |/| |
| * | Correct cache store superclass in commentJonah Burke2015-08-191-1/+1
* | | Merge pull request #21279 from ronakjangir47/test_cleanupKasper Timm Hansen2015-08-205-45/+30
|\ \ \
| * | | Cleaned up generators tests using internal assertion helperRonak Jangir2015-08-205-45/+30
* | | | Merge pull request #21132 from Andreis13/sprockets-4Rafael Mendonça França2015-08-199-22/+85
|\ \ \ \ | |_|/ / |/| | |
| * | | Migrate to Sprockets 4.Andrei Istratii2015-08-199-22/+85
|/ / /
* | | Merge pull request #21294 from maclover7/codeofconductGuillermo Iguaran2015-08-193-0/+9
|\ \ \
| * | | Add code of conduct to README.md and to contributing guide [ci skip]maclover72015-08-183-0/+9
* | | | Merge pull request #21292 from CoralineAda/cocDavid Heinemeier Hansson2015-08-191-0/+22
|\ \ \ \
| * | | | Adds a code of conductCoralineAda2015-08-181-0/+22
* | | | | Merge pull request #21282 from sjain1107/added_docsYves Senn2015-08-191-0/+3
|\ \ \ \ \
| * | | | | Added docs for TableDefinition #coloumns & #remove_column [ci skip]sjain11072015-08-181-0/+3
* | | | | | make the routes reader privateAaron Patterson2015-08-182-1/+2
* | | | | | don't touch internalsAaron Patterson2015-08-181-1/+1
* | | | | | drop array allocations when building pathsAaron Patterson2015-08-182-8/+8
* | | | | | symbols will always be constructed with strings. :bomb:Aaron Patterson2015-08-181-1/+1
* | | | | | drop string allocations for each resourceAaron Patterson2015-08-181-0/+2
| |_|/ / / |/| | | |
* | | | | Merge pull request #21110 from kamipo/mysql_json_supportRafael Mendonça França2015-08-1811-50/+258
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add a native JSON data type support in MySQLRyuta Kamizono2015-08-1811-50/+258
|/ / / /
* | | | Merge pull request #21283 from ravindrakumawat/add_docs_for_pending_migrationYves Senn2015-08-181-0/+1
|\ \ \ \
| * | | | Add Docs for ActiveRecord #check_pending [ci skip]ravindra kumar kumawat2015-08-181-0/+1
* | | | | Merge pull request #21284 from prakashlaxkar/argument_error_testsYves Senn2015-08-182-1/+9
|\ \ \ \ \
| * | | | | Correct error message in Standard American english and add a test case for th...prakash2015-08-182-1/+14
|/ / / / /
* | | | | Remove unreached default valueRafael Mendonça França2015-08-171-1/+1
* | | | | Merge pull request #21278 from byroot/try-arity-checkRafael Mendonça França2015-08-171-1/+1
|\ \ \ \ \
| * | | | | Use == 0 instead of .zero? in #tryJean Boussier2015-08-171-1/+1
| | |_|_|/ | |/| | |
* | | | | use the strategy pattern to match request verbsAaron Patterson2015-08-172-16/+49
* | | | | switch Route constructors and pass in the regexpAaron Patterson2015-08-171-9/+15
* | | | | split the verb regex from the constraints hashAaron Patterson2015-08-171-6/+17
* | | | | test the verb method on the route, specificallyAaron Patterson2015-08-171-1/+1
| |_|_|/ |/| | |
* | | | routes are always constructed with a hash for the conditionsAaron Patterson2015-08-173-4/+4
* | | | introduce an alternate constructor for Route objectsAaron Patterson2015-08-173-13/+17
* | | | drop object allocation during routes setupAaron Patterson2015-08-172-44/+89
|/ / /
* | | avoid is_a? checksAaron Patterson2015-08-172-2/+4
* | | pull RegexpOffsets in to a methodAaron Patterson2015-08-171-27/+14
* | | `required_defaults` is always passed in, remove conditionalAaron Patterson2015-08-171-1/+1
* | | Merge pull request #21276 from rodzyn/fix_buildRafael Mendonça França2015-08-171-0/+1
|\ \ \
| * | | Fix master buildMarcin Olichwirowicz2015-08-171-0/+1
|/ / /
* | | Merge pull request #21273 from piton4eg/patch-6Robin Dupret2015-08-171-6/+5
|\ \ \
| * | | Small fixes [ci skip]Alexey Markov2015-08-171-6/+5
* | | | use predicate methods to avoid is_a? checksAaron Patterson2015-08-172-1/+3