Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Move interrupt information to print_boot_information method | Alex Johnson | 2013-11-07 | 1 | -4/+1 |
| | |||||
* | Extract method refactoring for Rails::Server#start | Alex Johnson | 2013-11-07 | 1 | -24/+38 |
| | |||||
* | Merge pull request #12789 from claudiob/humanize-without-capitalizing | Xavier Noria | 2013-11-06 | 7 | -15/+58 |
|\ | | | | | Add +capitalize+ option to Inflector.humanize | ||||
| * | Add +capitalize+ option to Inflector.humanize | claudiob | 2013-11-06 | 7 | -15/+58 |
|/ | | | | | | | So strings can be humanized without being capitalized: 'employee_salary'.humanize # => "Employee salary" 'employee_salary'.humanize(capitalize: false) # => "employee salary" | ||||
* | Merge pull request #12788 from kylefritz/patch-1 | Rafael Mendonça França | 2013-11-06 | 1 | -2/+2 |
| | | | | | | rdoc: favicon source shouldn't begin with a slash to reference asset pipeline resource [ci skip] Conflicts: actionview/lib/action_view/helpers/asset_tag_helper.rb | ||||
* | Merge pull request #12783 from chancancode/eliminate_direct_json_gem_use | Jeremy Kemper | 2013-11-06 | 8 | -31/+32 |
|\ | | | | | Eliminate `JSON.{parse,load,generate,dump}` and `def to_json` | ||||
| * | Eliminate `JSON.{parse,load,generate,dump}` and `def to_json` | Godfrey Chan | 2013-11-05 | 8 | -31/+32 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JSON.{dump,generate} offered by the JSON gem is not compatiable with Rails at the moment and can cause a lot of subtle bugs when passed certain data structures. This changed all direct usage of the JSON gem in internal Rails code to always go through AS::JSON.{decode,encode}. We also shouldn't be implementing `to_json` most of the time, and these occurances are replaced with an equivilent `as_json` implementation to avoid problems down the road. See [1] for all the juicy details. [1]: intridea/multi_json#138 (comment) | ||||
* | | bring back constant to expose the enum mapping as HWIA. | Yves Senn | 2013-11-06 | 2 | -4/+19 |
| | | |||||
* | | update the AR enum docs to match the actual behavior. [ci skip] | Yves Senn | 2013-11-06 | 1 | -5/+3 |
|/ | |||||
* | Fix AS changelog indent, remove tabs and extra spaces [ci skip] | Carlos Antonio da Silva | 2013-11-06 | 1 | -2/+2 |
| | |||||
* | Merge pull request #12782 from chancancode/fix_object_and_struct_as_json | Jeremy Kemper | 2013-11-05 | 3 | -5/+40 |
|\ | | | | | Fixed Object#as_json and Struct#as_json with options | ||||
| * | Fixed Object#as_json and Struct#as_json with options | Godfrey Chan | 2013-11-05 | 3 | -5/+40 |
|/ | | | | | | | | | | | | These methods now takes the same options as Hash#as_json, for example: struct = Struct.new(:foo, :bar).new struct.foo = "hello" struct.bar = "world" json = struct.as_json(only: [:foo]) # => {foo: "hello"} This is extracted from PR #11728 from @sergiocampama, see also the discussion in #11460. | ||||
* | store enum mapping using `Strings` instead of `Symbols`. | Yves Senn | 2013-11-05 | 2 | -3/+9 |
| | | | | | This allows to assign both `String` and `Symbol` values to the enum without having to call `to_sym`, which is a security problem. | ||||
* | direct enum assignment rasies ArgumentError for unknown values. | Yves Senn | 2013-11-05 | 2 | -1/+18 |
| | |||||
* | Merge pull request #12776 from derekprior/dp-i18n-doc-fix | Rafael Mendonça França | 2013-11-05 | 1 | -1/+1 |
|\ | | | | | Clarify HTML Safe Translations | ||||
| * | Clarify HTML Safe Translations [ci-skip] | Derek Prior | 2013-11-05 | 1 | -1/+1 |
| | | | | | | | | | | | | I think it's confusing to say "Use them in views without escaping." We use all keys in views without escaping - the escaping is done for us automatically _unless_ we call html_safe or the key ends in _html. | ||||
* | | define enum methods inside a `Module` to make them overwritable. | Yves Senn | 2013-11-05 | 3 | -13/+34 |
| | | |||||
* | | Merge pull request #12390 from kennyj/rename_to_association_methods | Rafael Mendonça França | 2013-11-05 | 4 | -7/+7 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Renamed generated_feature_methods to generated_association_methods. Conflicts: activerecord/lib/active_record/associations/builder/association.rb activerecord/lib/active_record/associations/builder/singular_association.rb activerecord/test/cases/base_test.rb | ||||
| * | | Renamed generated_feature_methods to generated_association_methods. | kennyj | 2013-09-28 | 5 | -12/+12 |
| | | | |||||
* | | | Remove private API test | Rafael Mendonça França | 2013-11-05 | 1 | -10/+0 |
| |/ |/| | |||||
* | | Merge pull request #12773 from ptn/use_19_syntax_in_schema_test | Guillermo Iguaran | 2013-11-05 | 1 | -1/+1 |
|\ \ | | | | | | | Use 1.9 Hash syntax consistently | ||||
| * | | Use 1.9 Hash syntax consistently | Pablo Torres | 2013-11-05 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #12752 from notalex/expand_path_refactoring | Yves Senn | 2013-11-05 | 3 | -3/+3 |
|\ \ | | | | | | | Refactor File.expand_path usage to remove additional File.join | ||||
| * | | Refactor File.expand_path usage to remove additional File.join | Alex Johnson | 2013-11-05 | 3 | -3/+3 |
| | | | |||||
* | | | ask the fixture set for the sql statements | Aaron Patterson | 2013-11-04 | 2 | -11/+17 |
| | | | |||||
* | | | The enum value constant isn't used, so rm it for now. | Aaron Patterson | 2013-11-04 | 2 | -27/+7 |
| | | | |||||
* | | | stop doing the same calculation over and over | Aaron Patterson | 2013-11-04 | 1 | -4/+5 |
| | | | |||||
* | | | oops, template replay needs to happen after bundle. :orz: | Aaron Patterson | 2013-11-04 | 1 | -1/+1 |
| | | | |||||
* | | | application template respects Gemfile entries | Aaron Patterson | 2013-11-04 | 2 | -0/+25 |
| | | | |||||
* | | | gems can be added or skipped from the template | Aaron Patterson | 2013-11-04 | 4 | -2/+92 |
| | | | |||||
* | | | fix copy & paste test-case naming. [ci skip] | Yves Senn | 2013-11-04 | 1 | -1/+1 |
| | | | |||||
* | | | document `BACKTRACE` env var usage in testing guide. [ci skip] | Yves Senn | 2013-11-04 | 1 | -0/+11 |
| | | | |||||
* | | | Fix failures related to enum changes | Carlos Antonio da Silva | 2013-11-04 | 1 | -6/+4 |
| | | | | | | | | | | | | | | | | | | Commit 6e4a810f51b9ed2468b92247ef5568cc9d6dbcc0 changed the implementation from class_eval to define_method, but missed the access to the constant versus the access to the constant name. | ||||
* | | | Convert schema file to ruby 1.9 style hash | Carlos Antonio da Silva | 2013-11-04 | 1 | -214/+214 |
| | | | |||||
* | | | Style fixes on test schema file | Carlos Antonio da Silva | 2013-11-04 | 1 | -6/+6 |
| | | | |||||
* | | | Merge pull request #12755 from cbartlett/master | Carlos Antonio da Silva | 2013-11-04 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Remove extra whitespace | ||||
| * | | | Remove extra whitespace | Colin Bartlett | 2013-11-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | When generating an app with --skip_active_record, an extra line of whitespace was included unnecessarily. | ||||
* | | | | Refactor logic to grab the max time of the list of timestamp names in #cache_key | Carlos Antonio da Silva | 2013-11-04 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | Reuse the already existing logic used for grabbing this information from the updated columns. | ||||
* | | | | Respect cache timestamp format when giving timestamps to #cache_key | Carlos Antonio da Silva | 2013-11-04 | 2 | -3/+4 |
|/ / / | |||||
* | | | :scissors: [ci skip] | Carlos Antonio da Silva | 2013-11-04 | 2 | -5/+2 |
| | | | |||||
* | | | Merge pull request #12754 from ↵ | David Heinemeier Hansson | 2013-11-04 | 1 | -4/+12 |
|\ \ \ | | | | | | | | | | | | | | | | | ck3g/replace-class-evals-with-define-method-for-enum Replace `class_eval` with `define_method` for enum | ||||
| * | | | Replace `class_eval` with `define_method` for enum | Vitaly Tatarintsev | 2013-11-04 | 1 | -4/+12 |
| |/ / | | | | | | | | | | https://github.com/rails/rails/commit/db41eb8a6ea88b854bf5cd11070ea4245e1639c5#commitcomment-4502683 | ||||
* | | | Fix typo in railties changelog | Carlos Antonio da Silva | 2013-11-04 | 1 | -2/+2 |
| | | | | | | | | | | | | Also improve the example to show as shell command [ci skip] | ||||
* | | | Fix changelog indent [ci skip] | Carlos Antonio da Silva | 2013-11-04 | 1 | -6/+6 |
|/ / | |||||
* | | BACKTRACE environment variable to show unfiltered backtraces. | Yves Senn | 2013-11-04 | 3 | -6/+48 |
| | | | | | | | | | | | | | | | | | | | | | | We used to support the `BACKTRACE` environment variable but when we switched to MiniTest it got removed: f9382cd7948 This commit adds back the functionality to show the unfiltered backtrace when needed. This also works when you run your tests with `rake`: * `BACKTRACE=1 bin/rake test` * `BACKTRACE=1 ruby -Itest ...` | ||||
* | | Merge pull request #12750 from arunagw/webconsole-invite-only | Guillermo Iguaran | 2013-11-03 | 3 | -15/+0 |
|\ \ | | | | | | | Not adding webconsole by default in new apps | ||||
| * | | No web-console for now | Arun Agrawal | 2013-11-03 | 3 | -15/+0 |
|/ / | |||||
* | | Line up the comments for aesthetics | David Heinemeier Hansson | 2013-11-03 | 1 | -5/+5 |
| | | |||||
* | | Aesthetics | David Heinemeier Hansson | 2013-11-03 | 1 | -22/+30 |
| | | |||||
* | | Code style for privacy indention | David Heinemeier Hansson | 2013-11-03 | 1 | -8/+8 |
| | |