aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | default pattern to use a joined stringAaron Patterson2015-08-174-16/+20
|/ / /
* | | Merge pull request #21270 from jonatack/update-debugging-guide-byebug-infoKasper Timm Hansen2015-08-171-17/+6
|\ \ \
| * | | Update the Debugging Rails GuideJon Atack2015-08-171-17/+6
* | | | Merge pull request #21244 from ronakjangir47/method_call_assertions_fixKasper Timm Hansen2015-08-172-1/+7
|\ \ \ \
| * | | | Replacing lambda with proc getting argument error because of it.Ronak Jangir2015-08-172-1/+7
| | |_|/ | |/| |
* | | | Merge pull request #21272 from amitsuroliya/fix_docsArun Agrawal2015-08-171-1/+1
|\ \ \ \
| * | | | fix Docs [ci skip]amitkumarsuroliya2015-08-181-1/+1
|/ / / /
* | | | Merge pull request #21271 from amitsuroliya/typo_fixRichard Schneeman2015-08-171-2/+2
|\ \ \ \
| * | | | typo fix [ci skip]amitkumarsuroliya2015-08-181-2/+2
|/ / / /
* | | | Merge pull request #21252 from rodzyn/improve_params_parserRafael Mendonça França2015-08-171-2/+11
|\ \ \ \
| * | | | Cleanup ActionDispatch:ParamsParserMarcin Olichwirowicz2015-08-171-2/+11
* | | | | reorganize testing guide. [Zachary Scott & Yves Senn]Zachary Scott2015-08-171-329/+305
* | | | | Merge pull request #21264 from jonatack/fix-action-controller-strong-params-typoRafael Mendonça França2015-08-171-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | [skip ci] Fix minor typoJon Atack2015-08-171-1/+1
|/ / / /