aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* typos rectified lifecycle => life cycleAayush khandelwal2013-12-123-5/+5
* Merge pull request #13260 from arunagw/using-parallelize_meAaron Patterson2013-12-101-6/+3
|\
| * Using parallelize_me! to parallelize isolated testArun Agrawal2013-12-101-6/+3
* | Merge pull request #12699 from drogus/fix-mounting-engine-in-resourcesPiotr Sarnacki2013-12-103-2/+18
|\ \
| * | Fix mounting engines inside a resources blockPiotr Sarnacki2013-12-103-2/+18
|/ /
* | Revert "Rename not Ruby files to .tt"Santiago Pastorino2013-12-1016-0/+0
* | Merge pull request #13258 from semaperepelitsa/docsDamien Mathieu2013-12-101-1/+1
|\ \
| * | Fix typo in docs, missing colon in Symbol literal [ci skip]Semyon Perepelitsa2013-12-111-1/+1
|/ /
* | Merge pull request #13257 from eshira/optimize-gsubJosé Valim2013-12-101-1/+2
|\ \
| * | Replace with gsub! in ActiveSupport::Inflector.Elben Shira2013-12-101-1/+2
|/ /
* | Rename not Ruby files to .ttSantiago Pastorino2013-12-1016-0/+0
* | Merge pull request #13253 from strzalek/variants-inline2David Heinemeier Hansson2013-12-103-4/+65
|\ \
| * | Inline variants syntaxŁukasz Strzałkowski2013-12-103-3/+63
| * | Simplify @responses hash initializationŁukasz Strzałkowski2013-12-101-1/+2
* | | make `collect_deprecations` available.Yves Senn2013-12-101-11/+10
* | | Merge pull request #13236 from jetthoughts/13230_type_cast_bug_in_agr_functionsYves Senn2013-12-103-1/+23
|\ \ \
| * | | Fix type cast on group sum with custom expressionPaul Nikitochkin2013-12-103-1/+23
| |/ /
* | | doc: date/conversions.rb should talk about date format not time format.Yves Senn2013-12-101-2/+2
* | | Fix warnings on mysql2 explain testCarlos Antonio da Silva2013-12-101-3/+3
* | | Merge pull request #13248 from yahonda/support_mysql573_explainJeremy Kemper2013-12-091-3/+3
|\ \ \
| * | | Support MySQL 5.7 explainYasuo Honda2013-12-101-3/+3
| |/ /
* | | Merge pull request #13247 from yahonda/support_mysql573_primary_keyJeremy Kemper2013-12-093-7/+7
|\ \ \ | |/ / |/| |
| * | Remove `DEFAULT NULL` for primary key column to support MySQL 5.7.3Yasuo Honda2013-12-103-7/+7
|/ /
* | Revert "Merge pull request #13235 from strzalek/variants-inline" -- needs a l...David Heinemeier Hansson2013-12-082-28/+10
* | Merge pull request #13235 from strzalek/variants-inlineDavid Heinemeier Hansson2013-12-082-10/+28
|\ \ | |/ |/|
| * Inline variants syntaxŁukasz Strzałkowski2013-12-082-9/+27
| * Simplify @responses hash initializationŁukasz Strzałkowski2013-12-081-1/+1
* | Merge pull request #13231 from chancancode/upgrade_minitestGuillermo Iguaran2013-12-081-1/+1
|\ \
| * | Upgrade minitest versionGodfrey Chan2013-12-081-1/+1
| |/
* | Merge pull request #13232 from strzalek/av-missing-requiresRafael Mendonça França2013-12-082-0/+2
|\ \ | |/ |/|
| * Require action_view explicitly in AC::BaseŁukasz Strzałkowski2013-12-082-0/+2
|/
* Variants can be declared without a block to signify their presence in the con...David Heinemeier Hansson2013-12-073-2/+5
* Allow code execution in case no variant has been set with variant.noneDavid Heinemeier Hansson2013-12-072-4/+21
* Merge pull request #13221 from stereoscott/patch-1Godfrey Chan2013-12-061-1/+1
|\
| * fix typo, "state_state" should be "stale_state" [ci skip]Scott M2013-12-071-1/+1
|/
* Merge pull request #13219 from robin850/patch-11Godfrey Chan2013-12-061-1/+1
|\
| * Very tiny typo fix [ci skip]Robin Dupret2013-12-061-1/+1
|/
* Merge pull request #13059 from imkmf/cycle-accepts-arrayRafael Mendonça França2013-12-063-1/+26
|\
| * A Cycle object should accept an array and cycle through it as it wouldKristian Freeman2013-12-063-1/+24
* | Merge pull request #13213 from arunagw/aa-minitest-version-fixAaron Patterson2013-12-061-1/+1
|\ \
| * | Minitest upgrade broke buildArun Agrawal2013-12-061-1/+1
* | | Merge pull request #13214 from JuanitoFatas/masterGodfrey Chan2013-12-061-7/+11
|\ \ \
| * | | Some improvements on building nested forms. [ci skip]Juanito Fatas2013-12-071-7/+11
* | | | better error message for constants autoloaded from anonymous modules [fixes #...Xavier Noria2013-12-062-24/+22
* | | | Merge pull request #10635 from vipulnsward/change_to_strictJeremy Kemper2013-12-063-5/+20
|\ \ \ \
| * | | | Use `Base.strict_decode64` instead of `Base.decode64` just as we do in encoding;Vipul A M2013-05-163-5/+20
* | | | | Merge pull request #13216 from arunagw/plugin-gemfile-jrubyRafael Mendonça França2013-12-062-0/+13
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Skipping debugger from plugin Gemfile for JRubyArun Agrawal2013-12-062-0/+13
|/ / / /
* | | | Merge pull request #13210 from chancancode/more_enum_docsRafael Mendonça França2013-12-061-6/+7
|\ \ \ \
| * | | | _enum_methods_module should be kept privateGodfrey Chan2013-12-051-6/+7
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 23:25:57 +0000