Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge pull request #13257 from eshira/optimize-gsub | José Valim | 2013-12-10 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Replace with gsub! in ActiveSupport::Inflector. | Elben Shira | 2013-12-10 | 1 | -1/+2 | |
|/ / / / / / / | ||||||
* | | | | | | | Rename not Ruby files to .tt | Santiago Pastorino | 2013-12-10 | 16 | -0/+0 | |
* | | | | | | | Merge pull request #13253 from strzalek/variants-inline2 | David Heinemeier Hansson | 2013-12-10 | 3 | -4/+65 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Inline variants syntax | Łukasz Strzałkowski | 2013-12-10 | 3 | -3/+63 | |
| * | | | | | | | Simplify @responses hash initialization | Łukasz Strzałkowski | 2013-12-10 | 1 | -1/+2 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
* | | | | | | | make `collect_deprecations` available. | Yves Senn | 2013-12-10 | 1 | -11/+10 | |
* | | | | | | | Merge pull request #13236 from jetthoughts/13230_type_cast_bug_in_agr_functions | Yves Senn | 2013-12-10 | 3 | -1/+23 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix type cast on group sum with custom expression | Paul Nikitochkin | 2013-12-10 | 3 | -1/+23 | |
| |/ / / / / / | ||||||
* | | | | | | | doc: date/conversions.rb should talk about date format not time format. | Yves Senn | 2013-12-10 | 1 | -2/+2 | |
* | | | | | | | Fix warnings on mysql2 explain test | Carlos Antonio da Silva | 2013-12-10 | 1 | -3/+3 | |
* | | | | | | | Merge pull request #13248 from yahonda/support_mysql573_explain | Jeremy Kemper | 2013-12-09 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Support MySQL 5.7 explain | Yasuo Honda | 2013-12-10 | 1 | -3/+3 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #13247 from yahonda/support_mysql573_primary_key | Jeremy Kemper | 2013-12-09 | 3 | -7/+7 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Remove `DEFAULT NULL` for primary key column to support MySQL 5.7.3 | Yasuo Honda | 2013-12-10 | 3 | -7/+7 | |
|/ / / / / / | ||||||
* | | | | | | Revert "Merge pull request #13235 from strzalek/variants-inline" -- needs a l... | David Heinemeier Hansson | 2013-12-08 | 2 | -28/+10 | |
* | | | | | | Merge pull request #13235 from strzalek/variants-inline | David Heinemeier Hansson | 2013-12-08 | 2 | -10/+28 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Inline variants syntax | Łukasz Strzałkowski | 2013-12-08 | 2 | -9/+27 | |
| * | | | | | Simplify @responses hash initialization | Łukasz Strzałkowski | 2013-12-08 | 1 | -1/+1 | |
* | | | | | | Merge pull request #13231 from chancancode/upgrade_minitest | Guillermo Iguaran | 2013-12-08 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Upgrade minitest version | Godfrey Chan | 2013-12-08 | 1 | -1/+1 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #13232 from strzalek/av-missing-requires | Rafael Mendonça França | 2013-12-08 | 2 | -0/+2 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Require action_view explicitly in AC::Base | Łukasz Strzałkowski | 2013-12-08 | 2 | -0/+2 | |
|/ / / / / | ||||||
* | | | | | Variants can be declared without a block to signify their presence in the con... | David Heinemeier Hansson | 2013-12-07 | 3 | -2/+5 | |
* | | | | | Allow code execution in case no variant has been set with variant.none | David Heinemeier Hansson | 2013-12-07 | 2 | -4/+21 | |
| |_|_|/ |/| | | | ||||||
* | | | | Merge pull request #13221 from stereoscott/patch-1 | Godfrey Chan | 2013-12-06 | 1 | -1/+1 | |
|\ \ \ \ | ||||||
| * | | | | fix typo, "state_state" should be "stale_state" [ci skip] | Scott M | 2013-12-07 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #13219 from robin850/patch-11 | Godfrey Chan | 2013-12-06 | 1 | -1/+1 | |
|\ \ \ \ | ||||||
| * | | | | Very tiny typo fix [ci skip] | Robin Dupret | 2013-12-06 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #13059 from imkmf/cycle-accepts-array | Rafael Mendonça França | 2013-12-06 | 3 | -1/+26 | |
|\ \ \ \ | ||||||
| * | | | | A Cycle object should accept an array and cycle through it as it would | Kristian Freeman | 2013-12-06 | 3 | -1/+24 | |
* | | | | | Merge pull request #13213 from arunagw/aa-minitest-version-fix | Aaron Patterson | 2013-12-06 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Minitest upgrade broke build | Arun Agrawal | 2013-12-06 | 1 | -1/+1 | |
* | | | | | | Merge pull request #13214 from JuanitoFatas/master | Godfrey Chan | 2013-12-06 | 1 | -7/+11 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Some improvements on building nested forms. [ci skip] | Juanito Fatas | 2013-12-07 | 1 | -7/+11 | |
* | | | | | | | better error message for constants autoloaded from anonymous modules [fixes #... | Xavier Noria | 2013-12-06 | 2 | -24/+22 | |
* | | | | | | | Merge pull request #10635 from vipulnsward/change_to_strict | Jeremy Kemper | 2013-12-06 | 3 | -5/+20 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Use `Base.strict_decode64` instead of `Base.decode64` just as we do in encoding; | Vipul A M | 2013-05-16 | 3 | -5/+20 | |
* | | | | | | | | Merge pull request #13216 from arunagw/plugin-gemfile-jruby | Rafael Mendonça França | 2013-12-06 | 2 | -0/+13 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Skipping debugger from plugin Gemfile for JRuby | Arun Agrawal | 2013-12-06 | 2 | -0/+13 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #13210 from chancancode/more_enum_docs | Rafael Mendonça França | 2013-12-06 | 1 | -6/+7 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | _enum_methods_module should be kept private | Godfrey Chan | 2013-12-05 | 1 | -6/+7 | |
* | | | | | | | | Merge pull request #13212 from arunagw/vcf-mime-type-build-fix | Carlos Antonio da Silva | 2013-12-06 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | Fixed test for Mime::VCF | Arun Agrawal | 2013-12-06 | 1 | -3/+3 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #13211 from psahni/master | Arun Agrawal | 2013-12-05 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | capitalize words starting after numbered list to maintain consistency [ci skip] | Prashant Sahni | 2013-12-06 | 1 | -3/+3 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #13198 from chancancode/enum_docs | Godfrey Chan | 2013-12-05 | 1 | -1/+12 | |
|\| | | | | | | ||||||
| * | | | | | | Make clear that the enum array should not be changed once defined. [ci skip] | Godfrey Chan | 2013-12-05 | 1 | -1/+12 | |
|/ / / / / / | ||||||
* | | | | | | Add Mime::Type.register "text/vcard", :vcf to the default list of mime types | David Heinemeier Hansson | 2013-12-05 | 2 | -0/+5 | |
* | | | | | | Merge pull request #12684 from mariovisic/fix_kernel_silence_stream_descripto... | Carlos Antonio da Silva | 2013-12-05 | 3 | -0/+21 | |
|\ \ \ \ \ \ |